Author: fmancinelli
Date: 2007-11-19 15:47:54 +0100 (Mon, 19 Nov 2007)
New Revision: 6010
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/Activator.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/Application.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/ApplicationActionBarAdvisor.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/ApplicationWorkbenchAdvisor.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/ApplicationWorkbenchWindowAdvisor.java
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/Perspective.java
Log:
* Added copyrights
* Code reformatting
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/Activator.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/Activator.java
2007-11-19 14:45:52 UTC (rev 6009)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/Activator.java
2007-11-19 14:47:54 UTC (rev 6010)
@@ -1,3 +1,23 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * 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.xwiki.eclipse.rcp;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -7,55 +27,62 @@
/**
* The activator class controls the plug-in life cycle
*/
-public class Activator extends AbstractUIPlugin {
+public class Activator extends AbstractUIPlugin
+{
- // The plug-in ID
- public static final String PLUGIN_ID = "org.xwiki.xeclipse.rcp";
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.xwiki.xeclipse.rcp";
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
+ // The shared instance
+ private static Activator plugin;
- /*
- * (non-Javadoc)
- * @see
org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
+ /**
+ * The constructor
+ */
+ public Activator()
+ {
+ }
- /*
- * (non-Javadoc)
- * @see
org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see
org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception
+ {
+ super.start(context);
+ plugin = this;
+ }
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see
org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception
+ {
+ plugin = null;
+ super.stop(context);
+ }
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault()
+ {
+ return plugin;
+ }
+
+ /**
+ * Returns an image descriptor for the image file at the given plug-in
relative path
+ *
+ * @param path the path
+ * @return the image descriptor
+ */
+ public static ImageDescriptor getImageDescriptor(String path)
+ {
+ return imageDescriptorFromPlugin(PLUGIN_ID, path);
+ }
}
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/Application.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/Application.java
2007-11-19 14:45:52 UTC (rev 6009)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/Application.java
2007-11-19 14:47:54 UTC (rev 6010)
@@ -1,3 +1,23 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * 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.xwiki.eclipse.rcp;
import org.eclipse.equinox.app.IApplication;
@@ -9,38 +29,48 @@
/**
* This class controls all aspects of the application's execution
*/
-public class Application implements IApplication {
+public class Application implements IApplication
+{
- /* (non-Javadoc)
- * @see
org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
- */
- public Object start(IApplicationContext context) throws Exception {
- Display display = PlatformUI.createDisplay();
- try {
- int returnCode =
PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
- if (returnCode == PlatformUI.RETURN_RESTART)
- return IApplication.EXIT_RESTART;
- else
- return IApplication.EXIT_OK;
- } finally {
- display.dispose();
- }
-
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see
org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
+ */
+ public Object start(IApplicationContext context) throws Exception
+ {
+ Display display = PlatformUI.createDisplay();
+ try {
+ int returnCode =
+ PlatformUI.createAndRunWorkbench(display, new
ApplicationWorkbenchAdvisor());
+ if (returnCode == PlatformUI.RETURN_RESTART)
+ return IApplication.EXIT_RESTART;
+ else
+ return IApplication.EXIT_OK;
+ } finally {
+ display.dispose();
+ }
- /* (non-Javadoc)
- * @see org.eclipse.equinox.app.IApplication#stop()
- */
- public void stop() {
- final IWorkbench workbench = PlatformUI.getWorkbench();
- if (workbench == null)
- return;
- final Display display = workbench.getDisplay();
- display.syncExec(new Runnable() {
- public void run() {
- if (!display.isDisposed())
- workbench.close();
- }
- });
- }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.equinox.app.IApplication#stop()
+ */
+ public void stop()
+ {
+ final IWorkbench workbench = PlatformUI.getWorkbench();
+ if (workbench == null)
+ return;
+ final Display display = workbench.getDisplay();
+ display.syncExec(new Runnable()
+ {
+ public void run()
+ {
+ if (!display.isDisposed())
+ workbench.close();
+ }
+ });
+ }
}
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/ApplicationActionBarAdvisor.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/ApplicationActionBarAdvisor.java
2007-11-19 14:45:52 UTC (rev 6009)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/ApplicationActionBarAdvisor.java
2007-11-19 14:47:54 UTC (rev 6010)
@@ -1,3 +1,23 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * 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.xwiki.eclipse.rcp;
import java.util.ArrayList;
@@ -94,9 +114,9 @@
register(action);
}
}
-
+
IWorkbenchAction deleteAction = ActionFactory.DELETE.create(window);
- register(deleteAction);
+ register(deleteAction);
}
protected void fillMenuBar(IMenuManager menuBar)
@@ -108,16 +128,16 @@
menuBar.add(editMenu);
MenuManager windowMenu = new MenuManager("Window",
"org.xwiki.xeclipse.menu.Window");
-
+
MenuManager showViewMenu =
new MenuManager("Show view", "org.xwiki.xeclipse.menu.ShowView");
-
+
for (Action action : showViewActions) {
showViewMenu.add(action);
}
-
+
windowMenu.add(showViewMenu);
-
+
menuBar.add(windowMenu);
MenuManager helpMenu = new MenuManager("Help",
"org.xwiki.xeclipse.menu.Help");
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/ApplicationWorkbenchAdvisor.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/ApplicationWorkbenchAdvisor.java
2007-11-19 14:45:52 UTC (rev 6009)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/ApplicationWorkbenchAdvisor.java
2007-11-19 14:47:54 UTC (rev 6010)
@@ -1,3 +1,23 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * 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.xwiki.eclipse.rcp;
import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
@@ -4,15 +24,19 @@
import org.eclipse.ui.application.WorkbenchAdvisor;
import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
+public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor
+{
- private static final String PERSPECTIVE_ID =
"org.xwiki.xeclipse.rcp.perspective";
+ private static final String PERSPECTIVE_ID =
"org.xwiki.xeclipse.rcp.perspective";
- public WorkbenchWindowAdvisor
createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
+ public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
+ IWorkbenchWindowConfigurer configurer)
+ {
return new ApplicationWorkbenchWindowAdvisor(configurer);
}
- public String getInitialWindowPerspectiveId() {
- return PERSPECTIVE_ID;
- }
+ public String getInitialWindowPerspectiveId()
+ {
+ return PERSPECTIVE_ID;
+ }
}
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/ApplicationWorkbenchWindowAdvisor.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/ApplicationWorkbenchWindowAdvisor.java
2007-11-19 14:45:52 UTC (rev 6009)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/ApplicationWorkbenchWindowAdvisor.java
2007-11-19 14:47:54 UTC (rev 6010)
@@ -1,3 +1,23 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * 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.xwiki.eclipse.rcp;
import org.eclipse.swt.graphics.Point;
@@ -6,17 +26,21 @@
import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
+public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor
+{
- public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer
configurer) {
+ public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer
configurer)
+ {
super(configurer);
}
- public ActionBarAdvisor createActionBarAdvisor(IActionBarConfigurer
configurer) {
+ public ActionBarAdvisor createActionBarAdvisor(IActionBarConfigurer
configurer)
+ {
return new ApplicationActionBarAdvisor(configurer);
}
-
- public void preWindowOpen() {
+
+ public void preWindowOpen()
+ {
IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
configurer.setInitialSize(new Point(1280, 750));
configurer.setShowCoolBar(false);
Modified:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/Perspective.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/Perspective.java
2007-11-19 14:45:52 UTC (rev 6009)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/src/main/java/org/xwiki/eclipse/rcp/Perspective.java
2007-11-19 14:47:54 UTC (rev 6010)
@@ -1,3 +1,23 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * 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.xwiki.eclipse.rcp;
import org.eclipse.ui.IPageLayout;
@@ -3,12 +23,14 @@
import org.eclipse.ui.IPerspectiveFactory;
-public class Perspective implements IPerspectiveFactory {
+public class Perspective implements IPerspectiveFactory
+{
- public void createInitialLayout(IPageLayout layout) {
- layout.addView("org.xwiki.eclipse.views.XWikiExplorer",
IPageLayout.LEFT, 0.30f,
+ public void createInitialLayout(IPageLayout layout)
+ {
+ layout.addView("org.xwiki.eclipse.views.XWikiExplorer",
IPageLayout.LEFT, 0.30f, layout
+ .getEditorArea());
+
+ layout.addView("org.xwiki.eclipse.views.XWikiPagePreview",
IPageLayout.BOTTOM, 0.60f,
layout.getEditorArea());
-
- layout.addView("org.xwiki.eclipse.views.XWikiPagePreview",
IPageLayout.BOTTOM, 0.60f,
- layout.getEditorArea());
- }
+ }
}
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
