warnings removed when a new scout project is created using the new project wizard (for 3.7.2)releases/2011-Jun

8 files changed, 27 insertions, 13 deletions

diff --git a/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/project/template/SingleFormTemplateOperation.java b/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/project/template/SingleFormTemplateOperation.java
index ebc2cb85a..d70770120 100644
--- a/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/project/template/SingleFormTemplateOperation.java
+++ b/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/project/template/SingleFormTemplateOperation.java
@@ -21,6 +21,7 @@ import org.eclipse.scout.sdk.ScoutSdk;
 import org.eclipse.scout.sdk.icon.ScoutIconDesc;

 import org.eclipse.scout.sdk.jdt.signature.IImportValidator;

 import org.eclipse.scout.sdk.operation.ConfigPropertyMethodUpdateOperation;

+import org.eclipse.scout.sdk.operation.annotation.AnnotationCreateOperation;

 import org.eclipse.scout.sdk.operation.form.FormHandlerNewOperation;

 import org.eclipse.scout.sdk.operation.form.FormNewOperation;

 import org.eclipse.scout.sdk.operation.form.formdata.FormDataUpdateOperation;

@@ -143,6 +144,7 @@ public class SingleFormTemplateOperation implements IScoutProjectTemplateOperati
 

       workingCopyManager.reconcile(serviceOp.getCreatedServiceImplementation().getCompilationUnit(), monitor);

       MethodCreateOperation loadMethodOp = new MethodCreateOperation(serviceOp.getCreatedServiceImplementation(), "load");

+      loadMethodOp.addAnnotation(new AnnotationCreateOperation(null, Signature.createTypeSignature(Override.class.getName(), true)));

       loadMethodOp.setMethodFlags(Flags.AccPublic);

       loadMethodOp.setReturnTypeSignature(Signature.createTypeSignature(formData.getFullyQualifiedName(), true));

       loadMethodOp.setParameterNames(new String[]{"formData"});

diff --git a/org.eclipse.scout.sdk/templates/server/src/ServerApplication.java b/org.eclipse.scout.sdk/templates/server/src/ServerApplication.java
index 464805e3c..61f969ad8 100644
--- a/org.eclipse.scout.sdk/templates/server/src/ServerApplication.java
+++ b/org.eclipse.scout.sdk/templates/server/src/ServerApplication.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- * 

+ *

  * Contributors:

  *     BSI Business Systems Integration AG - initial API and implementation

  ******************************************************************************/

@@ -18,13 +18,13 @@ import org.eclipse.scout.commons.logger.ScoutLogManager;
 

 /**

  * Dummy application in order to manage server side product configurations in *.product files.

-* A typical config.ini for such a product has (among others) the following properties:

+ * A typical config.ini for such a product has (among others) the following properties:

  * osgi.clean=true

  * osgi.console=

  * eclipse.consoleLog=true

  * org.eclipse.equinox.http.jetty.http.port=8080

  * org.eclipse.equinox.http.jetty.context.path=/@@ALIAS@@

-* osgi.bundles=org.eclipse.equinox.common@2:start, org.eclipse.update.configurator@start, org.eclipse.equinox.http.jetty@start, org.eclipse.equinox.http.registry@start, org.eclipse.core.runtime@start

+ * osgi.bundles=org.eclipse.equinox.common@2:start, org.eclipse.update.configurator@start, org.eclipse.equinox.http.jetty@start, org.eclipse.equinox.http.registry@start, org.eclipse.core.runtime@start

  * osgi.bundles.defaultStartLevel=4

  * osgi.noShutdown=true

  * eclipse.ignoreApp=false

@@ -33,6 +33,7 @@ import org.eclipse.scout.commons.logger.ScoutLogManager;
 public class ServerApplication implements IApplication{

   private static IScoutLogger logger=ScoutLogManager.getLogger(ServerApplication.class);

 

+  @Override

   public Object start(IApplicationContext context) throws Exception {

     //start the scheduler

     /*

@@ -45,6 +46,7 @@ public class ServerApplication implements IApplication{
     return EXIT_OK;

   }

 

+  @Override

   public void stop() {}

 

 }

diff --git a/org.eclipse.scout.sdk/templates/shared/src/Activator.java b/org.eclipse.scout.sdk/templates/shared/src/Activator.java
index 17564abe0..31b07de62 100644
--- a/org.eclipse.scout.sdk/templates/shared/src/Activator.java
+++ b/org.eclipse.scout.sdk/templates/shared/src/Activator.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- * 

+ *

  * Contributors:

  *     BSI Business Systems Integration AG - initial API and implementation

  ******************************************************************************/

@@ -23,10 +23,12 @@ public class Activator implements BundleActivator{
     return plugin;

   }

 

+  @Override

   public void start(BundleContext context) throws Exception{

     plugin=this;

   }

 

+  @Override

   public void stop(BundleContext context) throws Exception{

     plugin=null;

   }

diff --git a/org.eclipse.scout.sdk/templates/ui.swing/src/Activator.java b/org.eclipse.scout.sdk/templates/ui.swing/src/Activator.java
index 28d32f409..f7b65ff13 100644
--- a/org.eclipse.scout.sdk/templates/ui.swing/src/Activator.java
+++ b/org.eclipse.scout.sdk/templates/ui.swing/src/Activator.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- * 

+ *

  * Contributors:

  *     BSI Business Systems Integration AG - initial API and implementation

  ******************************************************************************/

@@ -23,13 +23,14 @@ public class Activator implements BundleActivator{
     return plugin;

   }

 

+  @Override

   public void start(BundleContext context) throws Exception{

     plugin=this;

   }

 

+  @Override

   public void stop(BundleContext context) throws Exception{

     plugin=null;

   }

-

 }

 

diff --git a/org.eclipse.scout.sdk/templates/ui.swing/src/SwingApplication.java b/org.eclipse.scout.sdk/templates/ui.swing/src/SwingApplication.java
index 63f0f5294..8f49eb9a1 100644
--- a/org.eclipse.scout.sdk/templates/ui.swing/src/SwingApplication.java
+++ b/org.eclipse.scout.sdk/templates/ui.swing/src/SwingApplication.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- * 

+ *

  * Contributors:

  *     BSI Business Systems Integration AG - initial API and implementation

  ******************************************************************************/

@@ -34,6 +34,7 @@ public class SwingApplication extends AbstractSwingApplication{
     Subject subject=new Subject();

     subject.getPrincipals().add(new SimplePrincipal(System.getProperty("user.name")));

     return Subject.doAs(subject, new PrivilegedExceptionAction<Object>(){

+      @Override

       public Object run() throws Exception{

         return startSecure(context);

       }

diff --git a/org.eclipse.scout.sdk/templates/ui.swt/src/Activator.java b/org.eclipse.scout.sdk/templates/ui.swt/src/Activator.java
index d0e93aa2a..7ab5ee5c5 100644
--- a/org.eclipse.scout.sdk/templates/ui.swt/src/Activator.java
+++ b/org.eclipse.scout.sdk/templates/ui.swt/src/Activator.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- * 

+ *

  * Contributors:

  *     BSI Business Systems Integration AG - initial API and implementation

  ******************************************************************************/

@@ -35,11 +35,13 @@ public class Activator implements BundleActivator{
   // the shared instance

   private static Activator m_bundle;

 

+  @Override

   public void start(BundleContext context) throws Exception {

     m_bundle = this;

     m_environment = new SwtEnvironment(context.getBundle(), PERSPECITVE_ID, ClientSession.class);

   }

 

+  @Override

   public void stop(BundleContext context) throws Exception {

     m_bundle = null;

   }

diff --git a/org.eclipse.scout.sdk/templates/ui.swt/src/application/Application.java b/org.eclipse.scout.sdk/templates/ui.swt/src/application/Application.java
index 777e69a4c..21b69e709 100644
--- a/org.eclipse.scout.sdk/templates/ui.swt/src/application/Application.java
+++ b/org.eclipse.scout.sdk/templates/ui.swt/src/application/Application.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- * 

+ *

  * Contributors:

  *     BSI Business Systems Integration AG - initial API and implementation

  ******************************************************************************/

@@ -22,14 +22,15 @@ import org.eclipse.ui.PlatformUI;
 

 /** <h3>Activator</h3>

  *  This class controls all aspects of the application's execution

-*/

+ */

 public class Application implements IApplication {

 

-

+  @Override

 	public Object start(final IApplicationContext context) throws Exception {

     Subject subject=new Subject();

     subject.getPrincipals().add(new SimplePrincipal(System.getProperty("user.name")));

     return Subject.doAs(subject, new PrivilegedExceptionAction<Object>(){

+      @Override

       public Object run() throws Exception{

         return startSecure(context);

       }

@@ -53,14 +54,16 @@ public class Application implements IApplication {
 

 	/*

 	 * (non-Javadoc)

-* @see org.eclipse.equinox.app.IApplication#stop()

+   * @see org.eclipse.equinox.app.IApplication#stop()

 	 */

+	@Override

 	public void stop() {

 		final IWorkbench workbench = PlatformUI.getWorkbench();

 		if (workbench == null)

 			return;

 		final Display display = workbench.getDisplay();

 		display.syncExec(new Runnable() {

+		  @Override

 			public void run() {

 				if (!display.isDisposed())

 					workbench.close();

diff --git a/org.eclipse.scout.sdk/templates/ui.swt/src/perspective/Perspective.java b/org.eclipse.scout.sdk/templates/ui.swt/src/perspective/Perspective.java
index 66454e004..64230f914 100644
--- a/org.eclipse.scout.sdk/templates/ui.swt/src/perspective/Perspective.java
+++ b/org.eclipse.scout.sdk/templates/ui.swt/src/perspective/Perspective.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- * 

+ *

  * Contributors:

  *     BSI Business Systems Integration AG - initial API and implementation

  ******************************************************************************/

@@ -22,6 +22,7 @@ import @@BUNDLE_SWT_NAME@@.Activator;
 */

 public class Perspective implements IPerspectiveFactory {

 

+  @Override

 	public void createInitialLayout(IPageLayout layout) {

 

     layout.setEditorAreaVisible(false);