JBoss Tools SVN: r37422 - trunk/documentation/whatsnew/ws/images.
by jbosstools-commits@lists.jboss.org
Author: xcoulon
Date: 2011-12-19 07:48:19 -0500 (Mon, 19 Dec 2011)
New Revision: 37422
Added:
trunk/documentation/whatsnew/ws/images/jaxrs_validation_property_page.png
Log:
adding missing image
Added: trunk/documentation/whatsnew/ws/images/jaxrs_validation_property_page.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/ws/images/jaxrs_validation_property_page.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years
JBoss Tools SVN: r37421 - in trunk/forge/plugins/org.jboss.tools.forge.ui: META-INF and 7 other directories.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-12-19 07:16:48 -0500 (Mon, 19 Dec 2011)
New Revision: 37421
Added:
trunk/forge/plugins/org.jboss.tools.forge.ui/icons/link.gif
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/LinkHandler.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/SourceProvider.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StartHandler.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StopHandler.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java
Removed:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/ShowInForgeDelegate.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StartDelegate.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StopDelegate.java
Modified:
trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF
trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java
Log:
JBIDE-10523: Reimplement the Start/Stop functionality of the Forge View using the Command Framework
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2011-12-19 12:14:49 UTC (rev 37420)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2011-12-19 12:16:48 UTC (rev 37421)
@@ -21,7 +21,8 @@
org.eclipse.rse.ui;bundle-version="3.2.1",
org.eclipse.rse.core;bundle-version="3.2.1",
org.eclipse.rse.subsystems.files.core;bundle-version="3.2.101",
- org.eclipse.rse.subsystems.files.local;bundle-version="2.1.200"
+ org.eclipse.rse.subsystems.files.local;bundle-version="2.1.200",
+ org.eclipse.core.expressions;bundle-version="3.4.300"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.jboss.tools.forge.ui.ForgeUIPlugin
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/icons/link.gif
===================================================================
(Binary files differ)
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/icons/link.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-12-19 12:14:49 UTC (rev 37420)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-12-19 12:16:48 UTC (rev 37421)
@@ -4,63 +4,18 @@
<extension
point="org.eclipse.ui.views">
<category
- id="org.jboss.tools.forge"
+ id="org.jboss.tools.forge.ui"
name="Forge">
</category>
<view
- category="org.jboss.tools.forge"
+ category="org.jboss.tools.forge.ui"
class="org.jboss.tools.forge.ui.part.ForgeView"
icon="icons/jbossforge_icon_16px.png"
- id="org.jboss.tools.forge.console"
+ id="org.jboss.tools.forge.ui.view"
name="Forge Console"
restorable="true">
</view>
-<!-- <view
- category="org.jboss.tools.forge"
- class="org.jboss.tools.forge.ui.part.ConsoleView"
- id="org.jboss.tools.forge.console"
- name="Forge Console"
- restorable="true">
- </view> -->
</extension>
- <extension
- point="org.eclipse.ui.viewActions">
- <viewContribution
- id="org.jboss.tools.forge.view"
- targetID="org.jboss.tools.forge.console">
- <menu
- id="org.jboss.tools.forge.menubar"
- label="Forge">
- </menu>
- <action
- class="org.jboss.tools.forge.ui.action.StopDelegate"
- icon="icons/stop.gif"
- id="org.jboss.tools.forge.stop"
- label="Stop Forge"
- menubarPath="org.jboss.tools.forge.menubar"
- style="push"
- toolbarPath="org.jboss.tools.forge.toolbar">
- </action>
- <action
- class="org.jboss.tools.forge.ui.action.StartDelegate"
- icon="icons/start.gif"
- id="org.jboss.tools.forge.start"
- label="Start Forge"
- menubarPath="org.jboss.tools.forge.menu"
- style="push"
- toolbarPath="org.jboss.tools.forge.toolbar">
- </action>
- <action
- class="org.jboss.tools.forge.ui.action.ShowInForgeDelegate"
- icon="icons/jbossforge_icon_16px.png"
- id="org.jboss.tools.forge.show"
- label="Show In Forge"
- menubarPath="org.jboss.tools.forge.menu"
- style="push"
- toolbarPath="org.jboss.tools.forge.toolbar">
- </action>
- </viewContribution>
- </extension>
<extension point="org.eclipse.ui.preferencePages">
<page
name="Forge"
@@ -76,6 +31,24 @@
</extension>
<extension
point="org.eclipse.ui.commands">
+ <category
+ id="org.jboss.tools.forge.ui"
+ name="Forge Commands"/>
+ <command
+ categoryId="org.jboss.tools.forge.ui"
+ description="Start the default Forge runtime"
+ id="org.jboss.tools.forge.ui.start"
+ name="Start Forge"/>
+ <command
+ categoryId="org.jboss.tools.forge.ui"
+ description="Stop the default Forge runtime"
+ id="org.jboss.tools.forge.ui.stop"
+ name="Stop Forge"/>
+<!-- <command
+ categoryId="org.jboss.tools.forge.ui"
+ description="Link the currently selected item to the running Forge runtime"
+ id="org.jboss.tools.forge.ui.link"
+ name="Link To Selection"/> -->
<command
categoryId="org.eclipse.ui.category.window"
defaultHandler="org.jboss.tools.forge.ui.commands.ForgeCommandListHandler"
@@ -84,6 +57,63 @@
name="Forge Command List"/>
</extension>
<extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="menu:org.jboss.tools.forge.ui.view">
+ <command
+ commandId="org.jboss.tools.forge.ui.start"
+ icon="icons/start.gif"
+ label="Start Forge"
+ mnemonic="A"
+ style="push"
+ tooltip="Start the default Forge runtime">
+ </command>
+ <command
+ commandId="org.jboss.tools.forge.ui.stop"
+ icon="icons/stop.gif"
+ label="Stop Forge"
+ mnemonic="O"
+ style="push"
+ tooltip="Stop the running Forge runtime">
+ </command>
+<!-- <command
+ commandId="org.jboss.tools.forge.ui.link"
+ icon="icons/link.gif"
+ label="Link To Forge"
+ mnemonic="L"
+ style="toggle"
+ tooltip="Link the current selection to Forge">
+ </command> -->
+ </menuContribution>
+ <menuContribution
+ locationURI="toolbar:org.jboss.tools.forge.ui.view">
+ <command
+ commandId="org.jboss.tools.forge.ui.start"
+ icon="icons/start.gif"
+ label="Start Forge"
+ mnemonic="A"
+ style="push"
+ tooltip="Start the default Forge runtime">
+ </command>
+ <command
+ commandId="org.jboss.tools.forge.ui.stop"
+ icon="icons/stop.gif"
+ label="Stop Forge"
+ mnemonic="O"
+ style="push"
+ tooltip="Stop the running Forge runtime">
+ </command>
+<!-- <command
+ commandId="org.jboss.tools.forge.ui.link"
+ icon="icons/link.gif"
+ label="Link To Forge"
+ mnemonic="L"
+ style="toggle"
+ tooltip="Link the current selection to Forge">
+ </command> -->
+ </menuContribution>
+ </extension>
+ <extension
point="org.eclipse.ui.bindings">
<key
commandId="org.jboss.tools.forge.ui.commandList"
@@ -108,4 +138,53 @@
id = "org.jboss.tools.forge.console"/>
</perspectiveExtension>
</extension>
+ <extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ class="org.jboss.tools.forge.ui.commands.StartHandler"
+ commandId="org.jboss.tools.forge.ui.start">
+ <enabledWhen>
+ <with
+ variable="org.jboss.tools.forge.runtime.state">
+ <equals
+ value="org.jboss.tools.forge.runtime.notRunning">
+ </equals>
+ </with>
+ </enabledWhen>
+ </handler>
+ <handler
+ class="org.jboss.tools.forge.ui.commands.StopHandler"
+ commandId="org.jboss.tools.forge.ui.stop">
+ <enabledWhen>
+ <with
+ variable="org.jboss.tools.forge.runtime.state">
+ <equals
+ value="org.jboss.tools.forge.runtime.running">
+ </equals>
+ </with>
+ </enabledWhen>
+ </handler>
+<!-- <handler
+ class="org.jboss.tools.forge.ui.commands.LinkHandler"
+ commandId="org.jboss.tools.forge.ui.link">
+ <enabledWhen>
+ <with
+ variable="org.jboss.tools.forge.runtime.state">
+ <equals
+ value="org.jboss.tools.forge.runtime.running">
+ </equals>
+ </with>
+ </enabledWhen>
+ </handler> -->
+ </extension>
+ <extension
+ point="org.eclipse.ui.services">
+ <sourceProvider
+ provider="org.jboss.tools.forge.ui.commands.SourceProvider">
+ <variable
+ name="org.jboss.tools.forge.runtime.state"
+ priorityLevel="workbench">
+ </variable>
+ </sourceProvider>
+ </extension>
</plugin>
Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/ShowInForgeDelegate.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/ShowInForgeDelegate.java 2011-12-19 12:14:49 UTC (rev 37420)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/ShowInForgeDelegate.java 2011-12-19 12:16:48 UTC (rev 37421)
@@ -1,32 +0,0 @@
-package org.jboss.tools.forge.ui.action;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.part.ShowInContext;
-import org.jboss.tools.forge.ui.part.ForgeView;
-
-public class ShowInForgeDelegate implements IViewActionDelegate {
-
- private ForgeView forgeView = null;
-
- @Override
- public void run(IAction action) {
- if (forgeView != null) {
- forgeView.show(new ShowInContext(null, forgeView.getSelection()));
- }
- }
-
- @Override
- public void selectionChanged(IAction action, ISelection selection) {
- }
-
- @Override
- public void init(IViewPart view) {
- if (view != null && view instanceof ForgeView) {
- forgeView = (ForgeView)view;
- }
- }
-
-}
Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StartDelegate.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StartDelegate.java 2011-12-19 12:14:49 UTC (rev 37420)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StartDelegate.java 2011-12-19 12:16:48 UTC (rev 37421)
@@ -1,29 +0,0 @@
-package org.jboss.tools.forge.ui.action;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.jboss.tools.forge.ui.part.ForgeView;
-
-public class StartDelegate implements IViewActionDelegate {
-
- private IViewPart part = null;
-
- @Override
- public void run(IAction action) {
- if (part != null && part instanceof ForgeView) {
- ((ForgeView)part).startForge();
- }
- }
-
- @Override
- public void selectionChanged(IAction action, ISelection selection) {
- }
-
- @Override
- public void init(IViewPart view) {
- part = view;
- }
-
-}
Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StopDelegate.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StopDelegate.java 2011-12-19 12:14:49 UTC (rev 37420)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StopDelegate.java 2011-12-19 12:16:48 UTC (rev 37421)
@@ -1,31 +0,0 @@
-package org.jboss.tools.forge.ui.action;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.jboss.tools.forge.ui.part.ForgeView;
-
-public class StopDelegate implements IViewActionDelegate {
-
- private IViewPart part = null;
-
- @Override
- public void run(IAction action) {
- if (part != null && part instanceof ForgeView) {
- ((ForgeView)part).stopForge();
- }
- }
-
- @Override
- public void selectionChanged(IAction action, ISelection selection) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void init(IViewPart view) {
- part = view;
- }
-
-}
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/LinkHandler.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/LinkHandler.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/LinkHandler.java 2011-12-19 12:16:48 UTC (rev 37421)
@@ -0,0 +1,13 @@
+package org.jboss.tools.forge.ui.commands;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+
+public class LinkHandler extends AbstractHandler {
+
+ public Object execute(ExecutionEvent executionEvent) {
+ System.out.println("Execute Link Handler");
+ return null;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/LinkHandler.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/SourceProvider.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/SourceProvider.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/SourceProvider.java 2011-12-19 12:16:48 UTC (rev 37421)
@@ -0,0 +1,35 @@
+package org.jboss.tools.forge.ui.commands;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.ui.AbstractSourceProvider;
+import org.eclipse.ui.ISources;
+import org.jboss.tools.forge.core.process.ForgeRuntime;
+
+public class SourceProvider extends AbstractSourceProvider {
+
+ private String runtimeState = ForgeRuntime.STATE_NOT_RUNNING;
+
+ @Override
+ public void dispose() {
+ }
+
+ @Override
+ public Map<Object, Object> getCurrentState() {
+ Map<Object, Object> result = new HashMap<Object, Object>();
+ result.put(ForgeRuntime.PROPERTY_STATE, runtimeState);
+ return result;
+ }
+
+ @Override
+ public String[] getProvidedSourceNames() {
+ return new String[] { ForgeRuntime.PROPERTY_STATE };
+ }
+
+ public void setRuntimeState(String state) {
+ runtimeState = state;
+ fireSourceChanged(ISources.WORKBENCH, ForgeRuntime.PROPERTY_STATE, state);
+ }
+
+}
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/SourceProvider.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StartHandler.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StartHandler.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StartHandler.java 2011-12-19 12:16:48 UTC (rev 37421)
@@ -0,0 +1,18 @@
+package org.jboss.tools.forge.ui.commands;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.jboss.tools.forge.ui.part.ForgeView;
+import org.jboss.tools.forge.ui.util.ForgeHelper;
+
+public class StartHandler extends AbstractHandler {
+
+ public Object execute(ExecutionEvent executionEvent) {
+ ForgeView forgeView = ForgeHelper.getForgeView();
+ if (forgeView != null) {
+ forgeView.startForge();
+ }
+ return null;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StartHandler.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StopHandler.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StopHandler.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StopHandler.java 2011-12-19 12:16:48 UTC (rev 37421)
@@ -0,0 +1,18 @@
+package org.jboss.tools.forge.ui.commands;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.jboss.tools.forge.ui.part.ForgeView;
+import org.jboss.tools.forge.ui.util.ForgeHelper;
+
+public class StopHandler extends AbstractHandler {
+
+ public Object execute(ExecutionEvent executionEvent) {
+ ForgeView forgeView = ForgeHelper.getForgeView();
+ if (forgeView != null) {
+ forgeView.stopForge();
+ }
+ return null;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/StopHandler.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java 2011-12-19 12:14:49 UTC (rev 37420)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java 2011-12-19 12:16:48 UTC (rev 37421)
@@ -12,6 +12,7 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.forge.ui.ForgeUIPlugin;
+import org.jboss.tools.forge.ui.part.ForgeView;
public class ForgeCommandProcessor {
@@ -83,7 +84,7 @@
try {
IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
- workbenchPage.showView("org.jboss.tools.forge.console").setFocus();
+ workbenchPage.showView(ForgeView.ID).setFocus();
} catch (PartInitException e) {
ForgeUIPlugin.log(e);
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java 2011-12-19 12:14:49 UTC (rev 37420)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java 2011-12-19 12:16:48 UTC (rev 37421)
@@ -26,14 +26,16 @@
import org.eclipse.ui.part.PageSite;
import org.eclipse.ui.part.ShowInContext;
import org.eclipse.ui.part.ViewPart;
+import org.eclipse.ui.services.ISourceProviderService;
import org.jboss.tools.forge.core.preferences.ForgeRuntimesPreferences;
import org.jboss.tools.forge.core.process.ForgeRuntime;
import org.jboss.tools.forge.ui.ForgeUIPlugin;
+import org.jboss.tools.forge.ui.commands.SourceProvider;
import org.jboss.tools.forge.ui.console.ForgeTextViewer;
public class ForgeView extends ViewPart implements PropertyChangeListener, IShowInTarget {
- public static final String ID = "org.jboss.tools.forge.console";
+ public static final String ID = "org.jboss.tools.forge.ui.view";
private static final String NOT_RUNNING_MESSAGE = "Forge is not running.";
private static final String STARTING_MESSAGE = "Please wait while Forge is starting";
@@ -137,6 +139,7 @@
getDisplay().asyncExec(new Runnable() {
public void run() {
running.forceFocus();
+ updateCommands(ForgeRuntime.STATE_RUNNING);
}
});
}
@@ -154,10 +157,19 @@
notRunningPage.setMessage(notRunningMessage);
}
showPage(notRunning);
+ updateCommands(ForgeRuntime.STATE_NOT_RUNNING);
}
});
}
+ private void updateCommands(String state) {
+ ISourceProviderService service =
+ (ISourceProviderService)getViewSite().getService(ISourceProviderService.class);
+ SourceProvider sourceProvider =
+ (SourceProvider) service.getSourceProvider(ForgeRuntime.PROPERTY_STATE);
+ sourceProvider.setRuntimeState(state);
+ }
+
private void showPage(final Control control) {
if (getSite().getShell() != null) {
getDisplay().asyncExec(new Runnable() {
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java 2011-12-19 12:16:48 UTC (rev 37421)
@@ -0,0 +1,27 @@
+package org.jboss.tools.forge.ui.util;
+
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.forge.ui.part.ForgeView;
+
+public class ForgeHelper {
+
+ public static ForgeView getForgeView() {
+ IWorkbench workbench = PlatformUI.getWorkbench();
+ if (workbench == null) return null;
+ IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+ if (workbenchWindow == null) return null;
+ IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
+ if (workbenchPage == null) return null;
+ IViewPart viewPart = workbenchPage.findView(ForgeView.ID);
+ if (viewPart != null && viewPart instanceof ForgeView) {
+ return (ForgeView)viewPart;
+ } else {
+ return null;
+ }
+ }
+
+}
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years
JBoss Tools SVN: r37420 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-12-19 07:14:49 -0500 (Mon, 19 Dec 2011)
New Revision: 37420
Modified:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/
Log:
ignore .index files
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext
___________________________________________________________________
Modified: svn:ignore
- target
buildlog.latest.txt
bin
+ target
buildlog.latest.txt
bin
bin.index
14 years
JBoss Tools SVN: r37419 - in trunk/forge/plugins/org.jboss.tools.forge.runtime/modules: com/google/guava/main and 59 other directories.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-12-19 07:12:45 -0500 (Mon, 19 Dec 2011)
New Revision: 37419
Modified:
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/ch/qos/cal10n/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/com/google/guava/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/com/sun/xml/bind/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/activation/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/annotation/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/ejb/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/el/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/enterprise/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/enterprise/deploy/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/faces/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/inject/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/interceptor/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/jms/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/jws/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/mail/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/persistence/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/resource/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/security/auth/message/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/security/jacc/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/servlet/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/servlet/jsp/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/servlet/jstl/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/transaction/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/validation/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/ws/rs/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/xml/bind/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/xml/registry/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/xml/rpc/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/xml/soap/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/xml/ws/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/jline/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/apache/commons/logging/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/apache/httpcomponents/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/javassist/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/event-bus/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/git/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/javaee/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/javaee/impl/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/maven/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/maven/model/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/parser/java/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/parser/java/impl/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/parser/xml/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/scaffold/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/scaffold/impl/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/interceptor/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/interceptor/spi/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/logmanager/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/seam/render/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/shrinkwrap/descriptors/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/solder/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/weld/api/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/weld/core/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/weld/spi/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/mvel/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/slf4j/ext/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/slf4j/impl/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/slf4j/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/yaml/main/
Log:
ignore .index files
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/ch/qos/cal10n/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/com/google/guava/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/com/sun/xml/bind/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/activation/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/annotation/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/ejb/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/el/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/enterprise/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/enterprise/deploy/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/faces/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/inject/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/interceptor/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/jms/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/jws/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/mail/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/persistence/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/resource/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/security/auth/message/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/security/jacc/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/servlet/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/servlet/jsp/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/servlet/jstl/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/transaction/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/validation/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/ws/rs/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/xml/bind/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/xml/registry/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/xml/rpc/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/xml/soap/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/javax/xml/ws/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/jline/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/apache/commons/logging/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/apache/httpcomponents/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/javassist/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/event-bus/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/git/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/javaee/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/javaee/impl/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/maven/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/maven/model/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/parser/java/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/parser/java/impl/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/parser/xml/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/scaffold/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/scaffold/impl/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/interceptor/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/interceptor/spi/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/logmanager/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/seam/render/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/shrinkwrap/descriptors/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/solder/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/weld/api/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/weld/core/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/weld/spi/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/mvel/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/slf4j/ext/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/slf4j/impl/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/slf4j/main
___________________________________________________________________
Added: svn:ignore
+ *.index
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/yaml/main
___________________________________________________________________
Added: svn:ignore
+ *.index
14 years
JBoss Tools SVN: r37418 - trunk/documentation/whatsnew/openshift.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-12-19 07:10:06 -0500 (Mon, 19 Dec 2011)
New Revision: 37418
Removed:
trunk/documentation/whatsnew/openshift/openshift-news-3.3.0.M5.html
Modified:
trunk/documentation/whatsnew/openshift/openshift-news-2.3.0.M5.html
Log:
JBIDE-10434 fixed the mixup of versions in openshift to actually use the version of openshift tools
Modified: trunk/documentation/whatsnew/openshift/openshift-news-2.3.0.M5.html
===================================================================
--- trunk/documentation/whatsnew/openshift/openshift-news-2.3.0.M5.html 2011-12-19 12:01:19 UTC (rev 37417)
+++ trunk/documentation/whatsnew/openshift/openshift-news-2.3.0.M5.html 2011-12-19 12:10:06 UTC (rev 37418)
@@ -26,9 +26,79 @@
<p align="right"><a href="../index.html">< Main Index</a> <a
href="../maven/maven-news-3.3.0.M5.html">Maven Tools
></a></p>
- <table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <table border="0" cellpadding="10" cellspacing="0"
+ width="80%">
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>OpenShift Express Application Wizard</h3>
+ <hr/>
+ </td>
+ </tr>
<tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Embed Cartridges</b></td>
+ <td valign="top">
+ The OpenShift Express Application wizard now allows you to embed cartridges to your OpenShift application.
+ Cartridges add capabilities to your application. A typical usecase is to add a mysql database.
+ You allow your application to use a mysql database by embedding the mysql cartridge to it.
+ The OpenShift Express Application wizard will list all available cartridges and allow you to add/remove cartridges at will.
+ <p><img src="images/embed-cartridge.png" alt="embed cartridge"/></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Embed Jenkins</b></td>
+ <td valign="top">
+ An even more exciting use case is to embed jenkins to your OpenShift application. That will turn OpenShift into an Continous Integration server.
+ Anytime you push changes to OpenShift, a jenkins CI server will build your application.
+ Our wizard allows you to embed the jenkins client. It will verify behind the scenes that you already have a jenkins application and
+ prompt you to create one if you haven't yet.
+ <p><img src="images/create-jenkins.png" alt="create jenkins"/></p>
+ Credentials and url of your new jenkins instance will get reported to you accordingly.
+ <p><img src="images/jenkins-creation-log.png" alt="jenkins creation log"/></p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-9927">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Push Existing Projects</b></td>
+ <td valign="top">
+ The OpenShift Express Application wizard in M4 allowed you to import the demo application (that the OpenShift PaaS creates initially) to your workspace.
+ It was then up to you to merge the demo with your own application and push things to the OpenShift PaaS. Our tooling did not assist you in that case.
+ In M5 we now allow you to push your own application directly. Just uncheck <b>"Create New Project"</b> and choose the project from your workspace, that you want to
+ publish to OpenShift. The wizard will then copy OpenShift configurations and enable git on it. You'll then be able to manually push it to OpenShift
+ or let our Server Adapter do that job for you.
+ <p><img src="images/push-existing-project.png" alt="push existing project"/></p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-10171">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>OpenShift server adapter</b></td>
+ <td valign="top">
+ We also offer you an Eclipse WTP compliant OpenShift Server adapter that allows you to publish applications to OpenShift.
+ The server adapter is created when you finish the OpenShift Express Application wizard. We already offered that server adapter in M4.
+ We now turned it into its own distinct server type and made it work even more seamlessly.
+ <p><img src="images/openshift-server-adapter.png" alt="openshift server adapter"/></p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-9935">Related Jira</a></small></p>
+ </td>
+ </tr> <tr>
<td colspan="2">
+ <hr/>
+ <h3>OpenShift Express REST client</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>REST Client</b></td>
+ <td valign="top">
+ We developed a client for the OpenShift Express REST service in M4. It pretty much offers all features that
+ are currently available in the rhc-* command line tools (create/rename a domain, create/destroy applications,
+ list all existing applications, available cartridges, read the application log, embed cartridges etc.). <br/>
+ We moved it to github and joined forces with the OpenShift team.
+ The official client is now maintained at <a href="https://github.com/bdecoste/openshift-java-client">https://github.com/bdecoste/openshift-java-client</a>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-10068">Related Jira</a>, <a href="https://issues.jboss.org/browse/JBIDE-10455">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
<hr/>
<h3>Maven pom.xml editor</h3>
<hr/>
Deleted: trunk/documentation/whatsnew/openshift/openshift-news-3.3.0.M5.html
===================================================================
--- trunk/documentation/whatsnew/openshift/openshift-news-3.3.0.M5.html 2011-12-19 12:01:19 UTC (rev 37417)
+++ trunk/documentation/whatsnew/openshift/openshift-news-3.3.0.M5.html 2011-12-19 12:10:06 UTC (rev 37418)
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Language" content="en-us" />
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<link rel="stylesheet" href="../whatsnew.css" />
-<title>OpenShift Tools 3.3.0.M5 What's New</title>
-<script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-17645367-5']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
-
-</script></head>
-<body>
-<h1>OpenShift 3.3.0.M5 What's New</h1>
-
-<p align="right"><a href="../index.html">< Main Index</a> <a
- href="../esb/esb-news-1.5.1.M5.html">ESB Tools
- ></a></p>
- <table border="0" cellpadding="10" cellspacing="0" width="80%">
- <tr>
- <td colspan="2">
- <hr/>
- <h3>OpenShift Express Application Wizard</h3>
- <hr/>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Embed Cartridges</b></td>
- <td valign="top">
- The OpenShift Express Application wizard now allows you to embed cartridges to your OpenShift application.
- Cartridges add capabilities to your application. A typical usecase is to add a mysql database.
- You allow your application to use a mysql database by embedding the mysql cartridge to it.
- The OpenShift Express Application wizard will list all available cartridges and allow you to add/remove cartridges at will.
- <p><img src="images/embed-cartridge.png" alt="embed cartridge"/></p>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Embed Jenkins</b></td>
- <td valign="top">
- An even more exciting use case is to embed jenkins to your OpenShift application. That will turn OpenShift into an Continous Integration server.
- Anytime you push changes to OpenShift, a jenkins CI server will build your application.
- Our wizard allows you to embed the jenkins client. It will verify behind the scenes that you already have a jenkins application and
- prompt you to create one if you haven't yet.
- <p><img src="images/create-jenkins.png" alt="create jenkins"/></p>
- Credentials and url of your new jenkins instance will get reported to you accordingly.
- <p><img src="images/jenkins-creation-log.png" alt="jenkins creation log"/></p>
- <p><small><a href="https://issues.jboss.org/browse/JBIDE-9927">Related Jira</a></small></p>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Push Existing Projects</b></td>
- <td valign="top">
- The OpenShift Express Application wizard in M4 allowed you to import the demo application (that the OpenShift PaaS creates initially) to your workspace.
- It was then up to you to merge the demo with your own application and push things to the OpenShift PaaS. Our tooling did not assist you in that case.
- In M5 we now allow you to push your own application directly. Just uncheck <b>"Create New Project"</b> and choose the project from your workspace, that you want to
- publish to OpenShift. The wizard will then copy OpenShift configurations and enable git on it. You'll then be able to manually push it to OpenShift
- or let our Server Adapter do that job for you.
- <p><img src="images/push-existing-project.png" alt="push existing project"/></p>
- <p><small><a href="https://issues.jboss.org/browse/JBIDE-10171">Related Jira</a></small></p>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>OpenShift server adapter</b></td>
- <td valign="top">
- We also offer you an Eclipse WTP compliant OpenShift Server adapter that allows you to publish applications to OpenShift.
- The server adapter is created when you finish the OpenShift Express Application wizard. We already offered that server adapter in M4.
- We now turned it into its own distinct server type and made it work even more seamlessly.
- <p><img src="images/openshift-server-adapter.png" alt="openshift server adapter"/></p>
- <p><small><a href="https://issues.jboss.org/browse/JBIDE-9935">Related Jira</a></small></p>
- </td>
- </tr> <tr>
- <td colspan="2">
- <hr/>
- <h3>OpenShift Express REST client</h3>
- <hr/>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>REST Client</b></td>
- <td valign="top">
- We developed a client for the OpenShift Express REST service in M4. It pretty much offers all features that
- are currently available in the rhc-* command line tools (create/rename a domain, create/destroy applications,
- list all existing applications, available cartridges, read the application log, embed cartridges etc.). <br/>
- We moved it to github and joined forces with the OpenShift team.
- The official client is now maintained at <a href="https://github.com/bdecoste/openshift-java-client">https://github.com/bdecoste/openshift-java-client</a>
- <p><small><a href="https://issues.jboss.org/browse/JBIDE-10068">Related Jira</a>, <a href="https://issues.jboss.org/browse/JBIDE-10455">Related Jira</a></small></p>
- </td>
- </tr>
- </table>
-</body>
-
-</html>
-
-
14 years
JBoss Tools SVN: r37417 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0: META-INF and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2011-12-19 07:01:19 -0500 (Mon, 19 Dec 2011)
New Revision: 37417
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/.classpath
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/tools/hibernate-tools-3.5.0.Beta.jar
Log:
https://issues.jboss.org/browse/JBIDE-10503
Updated hibernate-tool.jar. Now it doesn't require cglib.
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/.classpath
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/.classpath 2011-12-19 10:24:22 UTC (rev 37416)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/.classpath 2011-12-19 12:01:19 UTC (rev 37417)
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry exported="true" kind="lib" path="lib/required/slf4j-api-1.5.8.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jpa/hibernate-entitymanager-4.0.0.CR6.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/required/antlr-2.7.7.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/required/classmate-0.5.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/required/commons-collections-3.2.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/required/dom4j-1.6.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/required/hibernate-commons-annotations-4.0.0.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/required/hibernate-core-4.0.0.CR6.jar" sourcepath="/home/eskimo/Downloads/hibernate-release-4.0.0.CR6/project"/>
- <classpathentry exported="true" kind="lib" path="lib/required/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/required/jandex-1.0.3.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/required/javassist-3.12.1.GA.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/required/jboss-logging-3.1.0.CR1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/required/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/tools/freemarker.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/tools/hibernate-tools-3.5.0.Beta.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/tools/jtidy-r8-20060801.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/bsh-core-2.0b4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.15.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.8.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry exported="true" kind="lib" path="lib/required/slf4j-api-1.5.8.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jpa/hibernate-entitymanager-4.0.0.CR6.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/required/antlr-2.7.7.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/required/classmate-0.5.4.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/required/commons-collections-3.2.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/required/dom4j-1.6.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/required/hibernate-commons-annotations-4.0.0.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/required/hibernate-core-4.0.0.CR6.jar" sourcepath="/home/eskimo/Downloads/hibernate-release-4.0.0.CR6/project"/>
+ <classpathentry exported="true" kind="lib" path="lib/required/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/required/jandex-1.0.3.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/required/javassist-3.12.1.GA.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/required/jboss-logging-3.1.0.CR1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/required/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/tools/freemarker.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/tools/hibernate-tools-3.5.0.Beta.jar" sourcepath="C:/dev/workspaces/RedHat/_Git/dgeraskov/hibernate-tools/src"/>
+ <classpathentry exported="true" kind="lib" path="lib/tools/jtidy-r8-20060801.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/bsh-core-2.0b4.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.15.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.8.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF 2011-12-19 10:24:22 UTC (rev 37416)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF 2011-12-19 12:01:19 UTC (rev 37417)
@@ -29,7 +29,6 @@
lib/required/jboss-logging-3.1.0.CR1.jar,
lib/required/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,
lib/tools/freemarker.jar,
- lib/tools/hibernate-tools-3.5.0.Alpha.jar,
lib/tools/hibernate-tools-3.5.0.Beta.jar,
lib/tools/jtidy-r8-20060801.jar,
lib/bsh-core-2.0b4.jar,
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/tools/hibernate-tools-3.5.0.Beta.jar
===================================================================
(Binary files differ)
14 years
JBoss Tools SVN: r37416 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate3_5/META-INF and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2011-12-19 05:24:22 -0500 (Mon, 19 Dec 2011)
New Revision: 37416
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-10522
Set provider names
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/META-INF/MANIFEST.MF 2011-12-19 07:39:25 UTC (rev 37415)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/META-INF/MANIFEST.MF 2011-12-19 10:24:22 UTC (rev 37416)
@@ -568,3 +568,4 @@
org.w3c.tidy,
org.w3c.tidy.ant,
pojo
+Bundle-Vendor: JBoss by Red Hat
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/META-INF/MANIFEST.MF 2011-12-19 07:39:25 UTC (rev 37415)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/META-INF/MANIFEST.MF 2011-12-19 10:24:22 UTC (rev 37416)
@@ -19,3 +19,4 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.debug.core
Bundle-ClassPath: .
+Bundle-Vendor: JBoss by Red Hat
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF 2011-12-19 07:39:25 UTC (rev 37415)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF 2011-12-19 10:24:22 UTC (rev 37416)
@@ -37,3 +37,4 @@
lib/log4j-1.2.15.jar,
lib/slf4j-log4j12-1.5.8.jar,
.
+Bundle-Vendor: JBoss by Red Hat
14 years
JBoss Tools SVN: r37415 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2011-12-19 02:39:25 -0500 (Mon, 19 Dec 2011)
New Revision: 37415
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/IconNameValueVisitor.java
Removed:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/EclipseHQLCompletionRequestor.java
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/EclipseHQLCompletionRequestor.java
Log:
https://issues.jboss.org/browse/JBIDE-10506
Fix exception in completion proposal
Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/EclipseHQLCompletionRequestor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/EclipseHQLCompletionRequestor.java 2011-12-18 20:11:22 UTC (rev 37414)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/EclipseHQLCompletionRequestor.java 2011-12-19 07:39:25 UTC (rev 37415)
@@ -1,151 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.hibernate.eclipse.hqleditor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.graphics.Image;
-import org.hibernate.console.ImageConstants;
-import org.hibernate.eclipse.console.utils.EclipseImages;
-import org.hibernate.eclipse.console.workbench.HibernateWorkbenchHelper;
-import org.hibernate.tool.ide.completion.HQLCompletionProposal;
-import org.hibernate.tool.ide.completion.IHQLCompletionRequestor;
-import org.hibernate.util.xpl.StringHelper;
-
-public class EclipseHQLCompletionRequestor implements IHQLCompletionRequestor {
-
- private final List<ICompletionProposal> result = new ArrayList<ICompletionProposal>();
- private String lastErrorMessage;
- private final int virtualOffset;
-
- public EclipseHQLCompletionRequestor() {
- virtualOffset = 0;
- }
-
- public EclipseHQLCompletionRequestor(int virtualOffset) {
- this.virtualOffset = virtualOffset;
- }
-
- public List<ICompletionProposal> getCompletionProposals() {
- return result;
- }
-
- public boolean accept(HQLCompletionProposal proposal) {
- result.add(new CompletionProposal(proposal.getCompletion(), // replacementString
- proposal.getReplaceStart()+virtualOffset, // replacementOffset
- proposal.getReplaceEnd()-proposal.getReplaceStart(), // replacementLength
- proposal.getCompletion().length(), // cursorPosition (relativeTo replacementStart)
- getImage(proposal),
- getDisplayString(proposal),
- null,
- null));
- return true;
- }
-
- private String getDisplayString(HQLCompletionProposal proposal) {
- StringBuffer buf = new StringBuffer(proposal.getSimpleName());
-
- switch(proposal.getCompletionKind()) {
- case HQLCompletionProposal.ENTITY_NAME:
- if(proposal.getEntityName()!=null &&
- !(proposal.getSimpleName().equals( proposal.getEntityName()))) {
- buf.append(" - "); //$NON-NLS-1$
- buf.append(StringHelper.qualifier( proposal.getEntityName() ));
- } else if(proposal.getShortEntityName()!=null &&
- !(proposal.getSimpleName().equals( proposal.getEntityName()))) {
- buf.append( " - " + proposal.getShortEntityName() ); //$NON-NLS-1$
- }
- break;
- case HQLCompletionProposal.ALIAS_REF:
- if(proposal.getShortEntityName()!=null) {
- buf.append( " - " + proposal.getShortEntityName() ); //$NON-NLS-1$
- } else if(proposal.getEntityName()!=null) {
- buf.append( " - " + proposal.getEntityName() ); //$NON-NLS-1$
- }
- break;
- case HQLCompletionProposal.PROPERTY:
- if(proposal.getShortEntityName()!=null) {
- buf.append( " - " + proposal.getShortEntityName() ); //$NON-NLS-1$
- } else if(proposal.getEntityName()!=null) {
- if(proposal.getEntityName().indexOf( "." )>=0) { //$NON-NLS-1$
- buf.append( " - " + StringHelper.unqualify( proposal.getEntityName() )); //$NON-NLS-1$
- } else {
- buf.append( " - " + proposal.getEntityName() ); //$NON-NLS-1$
- }
- }
- break;
- case HQLCompletionProposal.KEYWORD:
- break;
- case HQLCompletionProposal.FUNCTION:
- break;
- default:
-
- }
-
-
- return buf.toString();
- }
-
- private Image getImage(HQLCompletionProposal proposal) {
- String key = null;
-
- switch(proposal.getCompletionKind()) {
- case HQLCompletionProposal.ENTITY_NAME:
- case HQLCompletionProposal.ALIAS_REF:
- key = ImageConstants.MAPPEDCLASS;
- break;
- case HQLCompletionProposal.PROPERTY:
- if(proposal.getProperty()!=null) {
- return HibernateWorkbenchHelper.getImage( proposal.getProperty() );
- } else {
- key = ImageConstants.PROPERTY;
- }
- break;
- case HQLCompletionProposal.KEYWORD:
- key = null;
- break;
- case HQLCompletionProposal.FUNCTION:
- key = ImageConstants.FUNCTION;
- break;
- default:
- key = null;
- }
-
- return key==null?null:EclipseImages.getImage( key );
- }
-
- public void completionFailure(String errorMessage) {
- lastErrorMessage = errorMessage;
- }
-
- public String getLastErrorMessage() {
- return lastErrorMessage;
- }
-
- public void clear() {
- result.clear();
- lastErrorMessage = null;
- }
-
-}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/EclipseHQLCompletionRequestor.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/EclipseHQLCompletionRequestor.java 2011-12-18 20:11:22 UTC (rev 37414)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/EclipseHQLCompletionRequestor.java 2011-12-19 07:39:25 UTC (rev 37415)
@@ -28,8 +28,9 @@
import org.eclipse.swt.graphics.Image;
import org.hibernate.console.ImageConstants;
import org.hibernate.eclipse.console.utils.EclipseImages;
-import org.hibernate.eclipse.console.workbench.HibernateWorkbenchHelper;
import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Value;
import org.hibernate.tool.ide.completion.HQLCompletionProposal;
import org.hibernate.tool.ide.completion.IHQLCompletionRequestor;
@@ -116,8 +117,14 @@
key = ImageConstants.MAPPEDCLASS;
break;
case HQLCompletionProposal.PROPERTY:
- if(proposal.getProperty()!=null) {
- return HibernateWorkbenchHelper.getImage( proposal.getProperty() );
+ Property property = proposal.getProperty();
+ if(property!=null) {
+ if(property.getPersistentClass()!=null
+ && property.getPersistentClass().getIdentifierProperty()==property) {
+ key = ImageConstants.IDPROPERTY;
+ } else {
+ key = getIconNameForValue(property.getValue());
+ }
} else {
key = ImageConstants.PROPERTY;
}
@@ -147,5 +154,16 @@
result.clear();
lastErrorMessage = null;
}
+
+ static private String getIconNameForValue(Value value) {
+ String result;
+
+ result = (String) value.accept(new IconNameValueVisitor());
+
+ if(result==null) {
+ result = ImageConstants.UNKNOWNPROPERTY;
+ }
+ return result;
+ }
}
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/IconNameValueVisitor.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/IconNameValueVisitor.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/IconNameValueVisitor.java 2011-12-19 07:39:25 UTC (rev 37415)
@@ -0,0 +1,99 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tools.hibernate4_0.console;
+
+import org.hibernate.console.ImageConstants;
+import org.hibernate.mapping.Any;
+import org.hibernate.mapping.Array;
+import org.hibernate.mapping.Bag;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.DependantValue;
+import org.hibernate.mapping.IdentifierBag;
+import org.hibernate.mapping.List;
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.Map;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.OneToOne;
+import org.hibernate.mapping.PrimitiveArray;
+import org.hibernate.mapping.Set;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.mapping.ValueVisitor;
+
+final class IconNameValueVisitor implements ValueVisitor {
+
+ public Object accept(OneToOne oto) {
+ return ImageConstants.ONETOONE;
+ }
+
+ public Object accept(ManyToOne mto) {
+ return ImageConstants.MANYTOONE;
+ }
+
+ public Object accept(Component component) {
+ return ImageConstants.COMPONENT;
+ }
+
+ public Object accept(DependantValue value) {
+ return ImageConstants.UNKNOWNPROPERTY;
+ }
+
+ public Object accept(SimpleValue value) {
+ return ImageConstants.PROPERTY;
+ }
+
+ public Object accept(Any any) {
+ return ImageConstants.PROPERTY;
+ }
+
+ public Object accept(Set set) {
+ return ImageConstants.MANYTOONE;
+ }
+
+ public Object accept(OneToMany many) {
+ return ImageConstants.ONETOMANY;
+ }
+
+ public Object accept(Map map) {
+ return ImageConstants.MANYTOONE;
+ }
+
+ public Object accept(Array list) {
+ return ImageConstants.MANYTOONE;
+ }
+
+ public Object accept(PrimitiveArray primitiveArray) {
+ return ImageConstants.MANYTOONE;
+ }
+
+ public Object accept(List list) {
+ return ImageConstants.MANYTOONE;
+ }
+
+ public Object accept(IdentifierBag bag) {
+ return ImageConstants.MANYTOONE;
+ }
+
+ public Object accept(Bag bag) {
+ return ImageConstants.MANYTOONE;
+ }
+
+}
\ No newline at end of file
14 years
JBoss Tools SVN: r37414 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF.
by jbosstools-commits@lists.jboss.org
Author: ldimaggio
Date: 2011-12-18 15:11:22 -0500 (Sun, 18 Dec 2011)
New Revision: 37414
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF
Log:
Changed bundle version to:
Bundle-Version: 3.2.0.qualifier
To resolve build errors
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2011-12-17 01:21:31 UTC (rev 37413)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2011-12-18 20:11:22 UTC (rev 37414)
@@ -1,9 +1,32 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: JBoss Tools SWTBot Extensions
+Bundle-Name: Ext
Bundle-SymbolicName: org.jboss.tools.ui.bot.ext
Bundle-Version: 3.2.0.qualifier
+Bundle-ClassPath: .,
+ resources/drv/hsqldb.jar
Bundle-Activator: org.jboss.tools.ui.bot.ext.Activator
+Export-Package: org,
+ org.jboss,
+ org.jboss.tools,
+ org.jboss.tools.ui,
+ org.jboss.tools.ui.bot,
+ org.jboss.tools.ui.bot.ext,
+ org.jboss.tools.ui.bot.ext.condition,
+ org.jboss.tools.ui.bot.ext.config,
+ org.jboss.tools.ui.bot.ext.config.requirement,
+ org.jboss.tools.ui.bot.ext.entity,
+ org.jboss.tools.ui.bot.ext.gef,
+ org.jboss.tools.ui.bot.ext.gen,
+ org.jboss.tools.ui.bot.ext.generator,
+ org.jboss.tools.ui.bot.ext.helper,
+ org.jboss.tools.ui.bot.ext.matcher,
+ org.jboss.tools.ui.bot.ext.parts,
+ org.jboss.tools.ui.bot.ext.types,
+ org.jboss.tools.ui.bot.ext.view,
+ org.jboss.tools.ui.bot.ext.widgets,
+ org.jboss.tools.ui.bot.ext.wizards,
+ org.jboss.tools.ui.bot.ext.zest
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
@@ -24,25 +47,15 @@
org.eclipse.zest.core;bundle-version="1.2.0",
org.eclipse.zest.layouts;bundle-version="1.1.0",
org.eclipse.swtbot.eclipse.gef.finder;bundle-version="2.0.0",
- org.eclipse.gef;bundle-version="3.6.1"
+ org.eclipse.gef;bundle-version="3.6.1",
+ org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.core.runtime
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.eclipse.gef,
+ org.jboss.tools.ui.bot.ext.helper
Eclipse-RegisterBuddy: org.apache.log4j
-Export-Package: org.hsqldb,
- org.jboss.tools.ui.bot.ext,
- org.jboss.tools.ui.bot.ext.config,
- org.jboss.tools.ui.bot.ext.config.requirement,
- org.jboss.tools.ui.bot.ext.entity,
- org.jboss.tools.ui.bot.ext.gef,
- org.jboss.tools.ui.bot.ext.gen,
- org.jboss.tools.ui.bot.ext.helper,
- org.jboss.tools.ui.bot.ext.parts,
- org.jboss.tools.ui.bot.ext.types,
- org.jboss.tools.ui.bot.ext.view,
- org.jboss.tools.ui.bot.ext.widgets,
- org.jboss.tools.ui.bot.ext.wizards,
- org.jboss.tools.ui.bot.ext.zest
-Bundle-Vendor: JBoss by Red Hat
-Bundle-ClassPath: .,
- resources/drv/hsqldb.jar
-Import-Package: org.eclipse.gef
14 years
JBoss Tools SVN: r37413 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-12-16 20:21:31 -0500 (Fri, 16 Dec 2011)
New Revision: 37413
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
Log:
Add @SuppressWarnings quick fix https://issues.jboss.org/browse/JBIDE-10187
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-17 01:16:51 UTC (rev 37412)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-17 01:21:31 UTC (rev 37413)
@@ -120,7 +120,7 @@
if(change != null){
change.perform(new NullProgressMonitor());
- file.touch(new NullProgressMonitor());
+ original.reconcile(ICompilationUnit.NO_AST, false, null, new NullProgressMonitor());
}
compilationUnit.discardWorkingCopy();
} catch (JavaModelException e) {
14 years