Author: koen.aers(a)jboss.com Date: 2011-07-07 09:47:40 -0400 (Thu, 07 Jul 2011) New Revision: 32715 Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/ForgeUIPlugin.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/ 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 Removed: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgeUIPlugin.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/CommandRecorder.java Log: rename org.jboss.tools.forge.action into org.jboss.tools.forge.ui.action move ForgeUIPlugin to package org.jboss.tools.forge.ui 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-07-07 13:44:17 UTC (rev 32714) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2011-07-07 13:47:40 UTC (rev 32715) @@ -18,5 +18,5 @@ org.jboss.tools.forge.core;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Bundle-Activator: org.jboss.tools.forge.ForgeUIPlugin +Bundle-Activator: org.jboss.tools.forge.ui.ForgeUIPlugin Bundle-ClassPath: . Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-07-07 13:44:17 UTC (rev 32714) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-07-07 13:47:40 UTC (rev 32715) @@ -25,7 +25,7 @@ label="Forge"> </menu> <action - class="org.jboss.tools.forge.action.StopDelegate" + class="org.jboss.tools.forge.ui.action.StopDelegate" icon="icons/stop.gif" id="org.jboss.tools.forge.stop" label="Stop Forge" @@ -34,7 +34,7 @@ toolbarPath="org.jboss.tools.forge.toolbar"> </action> <action - class="org.jboss.tools.forge.action.StartDelegate" + class="org.jboss.tools.forge.ui.action.StartDelegate" icon="icons/start.gif" id="org.jboss.tools.forge.start" label="Start Forge" @@ -47,13 +47,13 @@ <extension point="org.eclipse.ui.preferencePages"> <page name="Forge" - class="org.jboss.tools.forge.preferences.ForgeEmptyPreferencePage" + class="org.jboss.tools.forge.ui.preferences.ForgeEmptyPreferencePage" id="org.jboss.tools.forge"> </page> <page name="Installed Forge Runtimes" category="org.jboss.tools.forge" - class="org.jboss.tools.forge.preferences.ForgeInstallationsPreferencePage" + class="org.jboss.tools.forge.ui.preferences.ForgeInstallationsPreferencePage" id="org.jboss.tools.forge.runtimes"> </page> </extension> Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgeUIPlugin.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgeUIPlugin.java 2011-07-07 13:44:17 UTC (rev 32714) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgeUIPlugin.java 2011-07-07 13:47:40 UTC (rev 32715) @@ -1,36 +0,0 @@ -package org.jboss.tools.forge; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -public class ForgeUIPlugin extends AbstractUIPlugin { - - public static final String PLUGIN_ID = "org.jboss.tools.forge.ui"; - - private static ForgeUIPlugin plugin; - - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - public static ForgeUIPlugin getDefault() { - return plugin; - } - - public static void log(Throwable t) { - getDefault().getLog().log(newErrorStatus("Error logged from Forge Plugin: ", t)); - } - - private static IStatus newErrorStatus(String message, Throwable exception) { - return new Status(IStatus.ERROR, PLUGIN_ID, IStatus.INFO, message, exception); - } - -} Copied: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/ForgeUIPlugin.java (from rev 32704, trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgeUIPlugin.java) =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/ForgeUIPlugin.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/ForgeUIPlugin.java 2011-07-07 13:47:40 UTC (rev 32715) @@ -0,0 +1,36 @@ +package org.jboss.tools.forge.ui; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +public class ForgeUIPlugin extends AbstractUIPlugin { + + public static final String PLUGIN_ID = "org.jboss.tools.forge.ui"; + + private static ForgeUIPlugin plugin; + + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + public static ForgeUIPlugin getDefault() { + return plugin; + } + + public static void log(Throwable t) { + getDefault().getLog().log(newErrorStatus("Error logged from Forge Plugin: ", t)); + } + + private static IStatus newErrorStatus(String message, Throwable exception) { + return new Status(IStatus.ERROR, PLUGIN_ID, IStatus.INFO, message, exception); + } + +} Added: 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 (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StartDelegate.java 2011-07-07 13:47:40 UTC (rev 32715) @@ -0,0 +1,28 @@ +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.ConsoleView; + +public class StartDelegate implements IViewActionDelegate { + + @Override + public void run(IAction action) { + ConsoleView.INSTANCE.startForge(); + } + + @Override + public void selectionChanged(IAction action, ISelection selection) { + // TODO Auto-generated method stub + + } + + @Override + public void init(IViewPart view) { + // TODO Auto-generated method stub + + } + +} Added: 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 (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/action/StopDelegate.java 2011-07-07 13:47:40 UTC (rev 32715) @@ -0,0 +1,28 @@ +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.ConsoleView; + +public class StopDelegate implements IViewActionDelegate { + + @Override + public void run(IAction action) { + ConsoleView.INSTANCE.stopForge(); + } + + @Override + public void selectionChanged(IAction action, ISelection selection) { + // TODO Auto-generated method stub + + } + + @Override + public void init(IViewPart view) { + // TODO Auto-generated method stub + + } + +} Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/CommandRecorder.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/CommandRecorder.java 2011-07-07 13:44:17 UTC (rev 32714) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/CommandRecorder.java 2011-07-07 13:47:40 UTC (rev 32715) @@ -24,9 +24,9 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.ui.part.ISetSelectionTarget; import org.eclipse.ui.texteditor.ITextEditor; -import org.jboss.tools.forge.ForgeUIPlugin; import org.jboss.tools.forge.importer.ProjectConfigurationUpdater; import org.jboss.tools.forge.importer.ProjectImporter; +import org.jboss.tools.forge.ui.ForgeUIPlugin; public class CommandRecorder implements IDocumentListener {