summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Kriese2011-03-02 04:20:23 (EST)
committerSteffen Kriese2011-03-02 04:20:23 (EST)
commiteb8cec90d2b6d3ec1b6b0790fd9fd1a680689f99 (patch)
tree27f633d53df818a6f8dc0d6136166bd4510cf6f1
parent0106ce33aad85fc75489c1b28019cb08d9973df4 (diff)
downloadorg.eclipse.riena.toolbox-eb8cec90d2b6d3ec1b6b0790fd9fd1a680689f99.zip
org.eclipse.riena.toolbox-eb8cec90d2b6d3ec1b6b0790fd9fd1a680689f99.tar.gz
org.eclipse.riena.toolbox-eb8cec90d2b6d3ec1b6b0790fd9fd1a680689f99.tar.bz2
code cleaning in toolbox
-rw-r--r--org.eclipse.riena.toolbox/AssemblyEditor.launch4
-rw-r--r--org.eclipse.riena.toolbox/plugin.xml9
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Activator.java2
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Util.java3
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AbstractXmlProvider.java8
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AddUIControlCallGenerator.java2
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AddUIControlCallVisitor.java2
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AssemblyDataProvider.java1
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/CodeGenerator.java2
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ModelService.java19
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/NodeFactory.java14
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/PluginXmlParser.java29
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/PluginXmlRenderer.java2
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/RidgetGenerator.java7
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/SWTControlInstantiationVisitor.java5
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/StartupEditorListener.java1
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/UIControlVisitor.java2
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IModelService.java4
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/INodeFactory.java8
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/AssemblyTreeViewer.java62
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/DetailSection.java2
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/IDirtyListener.java12
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/IconSelectorText.java5
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/OpenClassLink.java3
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/ToolboxTransfer.java2
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/AbstractDetailComposite.java12
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/AssemblyComposite.java6
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/BundleComposite.java2
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/ModuleComposite.java2
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/ModuleGroupComposite.java2
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/SubApplicationComposite.java4
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/SubModuleComposite.java9
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/PreferenceInitializer.java8
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/ToolboxConfigurationPreferencePage.java8
-rw-r--r--org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/views/AssemblyView.java77
35 files changed, 176 insertions, 164 deletions
diff --git a/org.eclipse.riena.toolbox/AssemblyEditor.launch b/org.eclipse.riena.toolbox/AssemblyEditor.launch
index d6c06be..1c39df0 100644
--- a/org.eclipse.riena.toolbox/AssemblyEditor.launch
+++ b/org.eclipse.riena.toolbox/AssemblyEditor.launch
@@ -19,8 +19,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="restart" value="false"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.core.commands@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.runtime@default:true,org.eclipse.pde.build@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.help.base@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.platform@default:default,org.apache.commons.httpclient*3.1.0.v20080605-1935@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.update.configurator@3:true,org.eclipse.jdt.core.manipulation@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jface.text@default:default,org.eclipse.pde.junit.runtime@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.ant@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.ui.browser@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.jdt.junit.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.app@default:default,org.eclipse.help.ui@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.help@default:default,org.eclipse.equinox.p2.updatesite@default:default,com.jcraft.jsch@default:default,org.apache.lucene@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.cvs@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.core.resources@default:default,org.eclipse.jdt.core@default:default,org.eclipse.help.webapp@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.swt@default:default,org.objectweb.asm@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.net4j.jms.api@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,javax.servlet.jsp@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.databinding.beans@default:default,org.sat4j.core@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.jdt.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.p2.operations@default:default,org.apache.commons.codec*1.3.0.v20100106-1700@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.core.variables@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.doc.isv@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jface@default:default,org.eclipse.team.core@default:default,javax.servlet@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.compare.win32@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.pde.core@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.ui.presentations.r21@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.help.appserver@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.apache.commons.logging*1.0.4.v200904062259@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.rcp@default:default,org.eclipse.ui.console@default:default,org.apache.jasper@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.pde.ds.ui@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.core.boot@default:default,org.eclipse.ant.ui@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.debug.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ant.launching@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.externaltools@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.update.core@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.pde.ui@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.common@2:true,org.eclipse.update.scheduler@default:default,org.eclipse.pde.launching@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.update.ui@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.registry@default:default,org.apache.commons.el@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.platform.doc.isv@default:default,org.eclipse.osgi.services@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.text@default:default,org.eclipse.osgi.util@default:default,org.eclipse.pde@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.debug.ui@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.core.jobs@default:default,org.hamcrest.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.ui.net@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.cheatsheets@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.ecf@default:default,org.eclipse.search@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.core.expressions@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.apache.log4j@default:default,org.apache.commons.collections@default:default,org.eclipse.riena.ui.core@default:default,org.apache.velocity@default:default,org.eclipse.riena.core@default:default,org.eclipse.riena.ui.templates@default:default,org.eclipse.riena.ui.swt@default:default,org.eclipse.riena.ui.common@default:default,org.jdom@default:default,org.eclipse.riena.ui.ridgets.swt@default:default,org.eclipse.riena.ui.wizard.cs@default:default,org.eclipse.riena.ui.ridgets@default:default,org.apache.oro@default:default,org.eclipse.equinox.log@default:default,org.eclipse.riena.beans.common@default:default,org.eclipse.riena.toolbox@default:default,org.pushingpixels.trident@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.lang@default:default,org.eclipse.nebula.widgets.compositetable@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.editors@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.ui.console@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.pde.launching@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.core.databinding@default:default,org.eclipse.cvs@default:default,org.eclipse.core.expressions@default:default,org.eclipse.update.ui@default:default,org.eclipse.jface@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.update.configurator@3:true,org.eclipse.jdt.apt.ui@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.osgi.services@default:default,org.apache.commons.codec*1.3.0.v20100106-1700@default:default,org.eclipse.ant.launching@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.update.core@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ui@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.debug.core@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.http.registry@default:default,org.apache.jasper@default:default,org.eclipse.ui.navigator.resources@default:default,org.apache.lucene@default:default,org.eclipse.pde.ds.ui@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.platform.doc.isv@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.security.ui@default:default,org.apache.commons.httpclient*3.1.0.v20080605-1935@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.core.boot@default:default,javax.servlet.jsp@default:default,org.apache.commons.logging*1.0.4.v200904062259@default:default,org.hamcrest.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.pde.doc.user@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.team.ui@default:default,org.eclipse.ui.win32@default:false,org.eclipse.jdt.launching@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.ui.ide@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.help.webapp@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.search@default:default,org.eclipse.compare.core@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.pde@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jsch.ui@default:default,org.mortbay.jetty.server@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.platform@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.pde.ua.core@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.browser@default:default,org.eclipse.pde.core@default:default,org.eclipse.rcp@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.util@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.views@default:default,org.sat4j.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.app@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.team.cvs.ui@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.ui.intro@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.net@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.jdt.junit.core@default:default,org.eclipse.help.appserver@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.jdt.debug.ui@default:default,com.jcraft.jsch@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.text@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.ds@default:true,org.sat4j.pb@default:default,org.eclipse.help@default:default,org.eclipse.jdt@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.net4j.jms.api@default:default,org.eclipse.pde.build@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.jdt.compiler.apt@default:false,org.apache.ant@default:default,org.objectweb.asm@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.pde.ui@default:default,org.eclipse.jsch.core@default:default,org.eclipse.ant.ui@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.core.resources@default:default,org.eclipse.compare@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.pde.ui.templates@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.compare.win32@default:default,org.eclipse.swt@default:default,org.eclipse.debug.ui@default:default,org.eclipse.help.ui@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.equinox.log@default:default,org.eclipse.riena.toolbox@default:default,org.apache.commons.collections@default:default,org.eclipse.riena.ui.ridgets@default:default,org.eclipse.riena.ui.templates@default:default,org.apache.velocity@default:default,org.eclipse.riena.ui.common@default:default,org.eclipse.riena.ui.wizard.cs@default:default,org.eclipse.riena.core@default:default,org.eclipse.riena.ui.core@default:default,org.eclipse.riena.ui.ridgets.swt@default:default,org.eclipse.nebula.widgets.compositetable@default:default,org.jdom@default:default,org.eclipse.riena.toolbox.previewer@default:default,org.apache.oro@default:default,org.eclipse.riena.toolbox.previewer.customizer@default:default,org.eclipse.riena.beans.common@default:default,org.apache.commons.lang@default:default,org.pushingpixels.trident@default:default,org.apache.log4j@default:default,org.apache.commons.beanutils@default:default,org.eclipse.riena.ui.swt@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/org.eclipse.riena.toolbox/plugin.xml b/org.eclipse.riena.toolbox/plugin.xml
index c626660..21612e9 100644
--- a/org.eclipse.riena.toolbox/plugin.xml
+++ b/org.eclipse.riena.toolbox/plugin.xml
@@ -17,15 +17,6 @@
</view>
</extension>
<extension
- point="org.eclipse.ui.editors">
- <editor
- class="org.eclipse.riena.toolbox.assemblyeditor.editors.NodeEditor"
- icon="icons/sample.gif"
- id="org.eclipse.riena.toolbox.assemblyeditor.editors.NodeEditor"
- name="NodeEditor">
- </editor>
- </extension>
- <extension
point="org.eclipse.ui.startup">
<startup
class="org.eclipse.riena.toolbox.assemblyeditor.StartupEditorListener">
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Activator.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Activator.java
index 82be414..9cf0985 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Activator.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Activator.java
@@ -29,7 +29,7 @@ import org.eclipse.riena.toolbox.assemblyeditor.model.AssemblyModel;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.riena.toolbox";
+ public static final String PLUGIN_ID = "org.eclipse.riena.toolbox"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Util.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Util.java
index 617653b..8078ecd 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Util.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/Util.java
@@ -46,7 +46,8 @@ public class Util {
return cleanNodeId;
}
- public static <T extends AbstractAssemblyNode> T findParentOfType(final AbstractAssemblyNode current,
+ @SuppressWarnings("unchecked")
+ public static <T extends AbstractAssemblyNode<?>> T findParentOfType(final AbstractAssemblyNode<?> current,
final Class<? extends T> type) {
if (null == current) {
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AbstractXmlProvider.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AbstractXmlProvider.java
index 51c7e13..6d57f12 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AbstractXmlProvider.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AbstractXmlProvider.java
@@ -135,15 +135,15 @@ public class AbstractXmlProvider {
final Transformer transformer = transformerFactory.newTransformer();
- transformer.setOutputProperty(OutputKeys.INDENT, "yes");
- transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+ transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
+ transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
// Unless a width is set, there will be only line breaks but no indentation.
// The IBM JDK and the Sun JDK don't agree on the property name,
// so we set them both.
//
- transformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", "4");
- transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
+ transformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", "4"); //$NON-NLS-1$ //$NON-NLS-2$
+ transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4"); //$NON-NLS-1$ //$NON-NLS-2$
return transformer;
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AddUIControlCallGenerator.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AddUIControlCallGenerator.java
index 7fae5f0..025a2f4 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AddUIControlCallGenerator.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AddUIControlCallGenerator.java
@@ -37,7 +37,7 @@ public class AddUIControlCallGenerator extends RidgetGenerator {
final String blackListString = Activator.getDefault().getPreferenceStore()
.getString(PreferenceConstants.CONST_CONFIGURE_RIDGETS_BLACKLIST);
if (Util.isGiven(blackListString)) {
- controlBlacklist = blackListString.split(";");
+ controlBlacklist = blackListString.split(";"); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AddUIControlCallVisitor.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AddUIControlCallVisitor.java
index 48ae567..55889af 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AddUIControlCallVisitor.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AddUIControlCallVisitor.java
@@ -27,7 +27,7 @@ public class AddUIControlCallVisitor extends ASTVisitor {
@Override
public boolean visit(final MethodInvocation node) {
- if ("addUIControl".equals(node.getName().getFullyQualifiedName())) {
+ if ("addUIControl".equals(node.getName().getFullyQualifiedName())) { //$NON-NLS-1$
if (!node.arguments().isEmpty()) {
final Object obj = node.arguments().get(0);
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AssemblyDataProvider.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AssemblyDataProvider.java
index cf5c7ed..140db30 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AssemblyDataProvider.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/AssemblyDataProvider.java
@@ -118,7 +118,6 @@ public class AssemblyDataProvider implements IAssemblyDataProvider {
}
} else if (res.getType() == IResource.PROJECT) {
- final IProject project = (IProject) res;
if (delta.getKind() == IResourceDelta.ADDED) {
addedProject = (IProject) res;
return false;
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/CodeGenerator.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/CodeGenerator.java
index ed658de..c6ebc62 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/CodeGenerator.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/CodeGenerator.java
@@ -136,7 +136,7 @@ public class CodeGenerator implements ICodeGenerator {
String bundleAbsolutePath = bundle.getAbsolutePath();
if (bundleAbsolutePath.endsWith(".jar")) { //$NON-NLS-1$
bundleAbsolutePath = bundleAbsolutePath.replace('\\', '/');
- if (bundleAbsolutePath.startsWith("/")) {
+ if (bundleAbsolutePath.startsWith("/")) { //$NON-NLS-1$
bundleAbsolutePath = bundleAbsolutePath.substring(1);
}
bundleAbsolutePath = "jar:file:/" + bundleAbsolutePath + "!/" + DIR_TEMPLATES + "/"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ModelService.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ModelService.java
index 8f12079..2bdd46b 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ModelService.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ModelService.java
@@ -33,13 +33,13 @@ public class ModelService implements IModelService {
return typeIds;
}
- public Set<String> getAllTypeIds(final AssemblyModel model, final AbstractTypedNode ignoreNode) {
+ public Set<String> getAllTypeIds(final AssemblyModel model, final AbstractTypedNode<?> ignoreNode) {
final Set<String> typeIds = new HashSet<String>();
typeIds.add(CONST_APPLICATION);
for (final BundleNode bundle : model.getChildren()) {
for (final AssemblyNode ass : bundle.getChildren()) {
- for (final AbstractTypedNode typeNode : ass.getChildren()) {
+ for (final AbstractTypedNode<?> typeNode : ass.getChildren()) {
if (!typeNode.equals(ignoreNode) && Util.isGiven(typeNode.getNodeId())) {
typeIds.add(typeNode.getNodeId());
@@ -52,9 +52,10 @@ public class ModelService implements IModelService {
return typeIds;
}
- private void findTypeIds(final Set<String> ids, final AbstractTypedNode parent, final AbstractTypedNode ignoreNode) {
+ private void findTypeIds(final Set<String> ids, final AbstractTypedNode<?> parent,
+ final AbstractTypedNode<?> ignoreNode) {
for (final Object typeNode : parent.getChildren()) {
- final AbstractTypedNode abs = (AbstractTypedNode) typeNode;
+ final AbstractTypedNode<?> abs = (AbstractTypedNode<?>) typeNode;
if (!typeNode.equals(ignoreNode)) {
if (null != abs && Util.isGiven(abs.getNodeId())) {
@@ -79,16 +80,16 @@ public class ModelService implements IModelService {
final ClassNameVisitor nodeVisitor = new ClassNameVisitor(className);
for (final AssemblyNode ass : bundle.getChildren()) {
- for (final AbstractTypedNode child : ass.getChildren()) {
+ for (final AbstractTypedNode<?> child : ass.getChildren()) {
visitNode(child, nodeVisitor);
}
}
return nodeVisitor.getFoundNode();
}
- private void visitNode(final AbstractTypedNode parent, final AssemblyNodeVisitor visitor) {
+ private void visitNode(final AbstractTypedNode<?> parent, final AssemblyNodeVisitor visitor) {
for (final Object typeNode : parent.getChildren()) {
- final AbstractTypedNode abs = (AbstractTypedNode) typeNode;
+ final AbstractTypedNode<?> abs = (AbstractTypedNode<?>) typeNode;
if (visitor.visit(abs)) {
visitNode(abs, visitor);
} else {
@@ -105,7 +106,7 @@ public class ModelService implements IModelService {
this.className = className;
}
- public boolean visit(final AbstractTypedNode node) {
+ public boolean visit(final AbstractTypedNode<?> node) {
if (node instanceof SubModuleNode) {
final SubModuleNode subMod = (SubModuleNode) node;
if (className.equals(subMod.getController())) {
@@ -127,7 +128,7 @@ public class ModelService implements IModelService {
}
private interface AssemblyNodeVisitor {
- public boolean visit(AbstractTypedNode node);
+ public boolean visit(AbstractTypedNode<?> node);
}
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/NodeFactory.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/NodeFactory.java
index d2a7fc8..bdbc886 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/NodeFactory.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/NodeFactory.java
@@ -39,12 +39,12 @@ public class NodeFactory implements INodeFactory {
final AssemblyNode ass = new AssemblyNode(parentBundle);
setPreSuffixes(parentBundle, ass, SUFFIX_ASSEMBLY);
ass.setName(CONST_NEW_IDENTIFIER);
- ass.setNodeTypeId("application");
+ ass.setNodeTypeId("application"); //$NON-NLS-1$
ass.setBundle(parentBundle);
return ass;
}
- public ModuleNode createModule(final AbstractAssemblyNode parent, final BundleNode parentBundle) {
+ public ModuleNode createModule(final AbstractAssemblyNode<?> parent, final BundleNode parentBundle) {
final ModuleNode node = new ModuleNode(parent);
setPreSuffixes(parentBundle, node, SUFFIX_MODULE);
node.setName(CONST_NEW_IDENTIFIER);
@@ -53,7 +53,7 @@ public class NodeFactory implements INodeFactory {
return node;
}
- public ModuleGroupNode createModuleGroup(final AbstractAssemblyNode parent, final BundleNode parentBundle) {
+ public ModuleGroupNode createModuleGroup(final AbstractAssemblyNode<?> parent, final BundleNode parentBundle) {
final ModuleGroupNode node = new ModuleGroupNode(parent);
setPreSuffixes(parentBundle, node, SUFFIX_MODULE_GROUP);
node.setName(CONST_NEW_IDENTIFIER);
@@ -61,7 +61,7 @@ public class NodeFactory implements INodeFactory {
return node;
}
- public SubApplicationNode createSubApplication(final AbstractAssemblyNode parent, final BundleNode parentBundle) {
+ public SubApplicationNode createSubApplication(final AbstractAssemblyNode<?> parent, final BundleNode parentBundle) {
final SubApplicationNode node = new SubApplicationNode(parent);
setPreSuffixes(parentBundle, node, SUFFIX_SUBAPPLICATION);
node.setBundle(parentBundle);
@@ -69,7 +69,7 @@ public class NodeFactory implements INodeFactory {
return node;
}
- public SubModuleNode createSubModule(final AbstractAssemblyNode parent, final BundleNode parentBundle) {
+ public SubModuleNode createSubModule(final AbstractAssemblyNode<?> parent, final BundleNode parentBundle) {
final SubModuleNode node = new SubModuleNode(parent);
setPreSuffixes(parentBundle, node, SUFFIX_SUBMODULE);
node.setName(CONST_NEW_IDENTIFIER);
@@ -90,14 +90,14 @@ public class NodeFactory implements INodeFactory {
return persp;
}
- private void setPreSuffixes(final AbstractAssemblyNode parent, final AssemblyNode typedNode, final String suffix) {
+ private void setPreSuffixes(final AbstractAssemblyNode<?> parent, final AssemblyNode typedNode, final String suffix) {
typedNode.setPrefix(parent.getName() + SEP);
typedNode.setSuffix(SEP + suffix);
typedNode.setId(typedNode.getPrefix() + CONST_NEW_IDENTIFIER + typedNode.getSuffix());
}
- private void setPreSuffixes(final AbstractAssemblyNode parent, final AbstractTypedNode typedNode,
+ private void setPreSuffixes(final AbstractAssemblyNode<?> parent, final AbstractTypedNode<?> typedNode,
final String suffix) {
typedNode.setPrefix(parent.getName() + SEP);
typedNode.setSuffix(SEP + suffix);
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/PluginXmlParser.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/PluginXmlParser.java
index 3be91b7..e1709d2 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/PluginXmlParser.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/PluginXmlParser.java
@@ -40,6 +40,11 @@ import org.eclipse.riena.toolbox.assemblyeditor.model.SubModuleNode;
public class PluginXmlParser extends AbstractXmlProvider implements IPluginXmlParser {
+ /**
+ *
+ */
+ private static final String NODE_SEPARATOR = "."; //$NON-NLS-1$
+
public List<AssemblyNode> parseDocument(final BundleNode bundleNode) {
return parseDocument(bundleNode, getDocument(bundleNode));
@@ -124,9 +129,9 @@ public class PluginXmlParser extends AbstractXmlProvider implements IPluginXmlPa
private RCPPerspective parsePerspective(final Element elm) {
final RCPPerspective view = new RCPPerspective();
- view.setId(elm.getAttribute("id"));
- view.setPerspectiveClass(elm.getAttribute("class"));
- view.setName(elm.getAttribute("name"));
+ view.setId(elm.getAttribute(ATTR_VIEW_ID));
+ view.setPerspectiveClass(elm.getAttribute(ATTR_VIEW_CLASS));
+ view.setName(elm.getAttribute(ATTR_VIEW_NAME));
return view;
}
@@ -179,17 +184,17 @@ public class PluginXmlParser extends AbstractXmlProvider implements IPluginXmlPa
}
// dont calculate preSuffixe if there is a varname in the 'name' property
- if (name.contains("${")) {
+ if (name.contains("${")) { //$NON-NLS-1$
return;
}
- final Pattern pattern = Pattern.compile("(.*?)\\." + name + "\\.(.*?)");
+ final Pattern pattern = Pattern.compile("(.*?)\\." + name + "\\.(.*?)"); //$NON-NLS-1$ //$NON-NLS-2$
final Matcher matcher = pattern.matcher(typeId);
if (matcher.matches()) {
final String prefix = matcher.group(1);
final String suffix = matcher.group(2);
- typedNode.setPrefix(prefix + ".");
- typedNode.setSuffix("." + suffix);
+ typedNode.setPrefix(prefix + NODE_SEPARATOR);
+ typedNode.setSuffix(NODE_SEPARATOR + suffix);
}
}
@@ -200,7 +205,7 @@ public class PluginXmlParser extends AbstractXmlProvider implements IPluginXmlPa
*
* @param typedNode
*/
- private void computePreSuffixe(final AbstractTypedNode typedNode) {
+ private void computePreSuffixe(final AbstractTypedNode<?> typedNode) {
final String name = typedNode.getName();
final String nodeId = typedNode.getNodeId();
@@ -209,17 +214,17 @@ public class PluginXmlParser extends AbstractXmlProvider implements IPluginXmlPa
}
// dont calculate preSuffixe if there is a varname in the 'name' property
- if (name.contains("${")) {
+ if (name.contains("${")) { //$NON-NLS-1$
return;
}
- final Pattern pattern = Pattern.compile("(.*?)\\." + name + "\\.(.*?)");
+ final Pattern pattern = Pattern.compile("(.*?)\\." + name + "\\.(.*?)"); //$NON-NLS-1$ //$NON-NLS-2$
final Matcher matcher = pattern.matcher(nodeId);
if (matcher.matches()) {
final String prefix = matcher.group(1);
final String suffix = matcher.group(2);
- typedNode.setPrefix(prefix + ".");
- typedNode.setSuffix("." + suffix);
+ typedNode.setPrefix(prefix + NODE_SEPARATOR);
+ typedNode.setSuffix(NODE_SEPARATOR + suffix);
}
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/PluginXmlRenderer.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/PluginXmlRenderer.java
index 813c6b6..ea811fd 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/PluginXmlRenderer.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/PluginXmlRenderer.java
@@ -218,7 +218,7 @@ public class PluginXmlRenderer extends AbstractXmlProvider implements IPluginXml
for (final AssemblyNode ass : bundleNode.getChildren()) {
final Element elmAss = renderAssembly(elmExtension, ass);
- for (final AbstractAssemblyNode child : ass.getChildren()) {
+ for (final AbstractAssemblyNode<?> child : ass.getChildren()) {
if (child instanceof SubApplicationNode) {
renderSubApplication(elmAss, (SubApplicationNode) child);
} else if (child instanceof ModuleGroupNode) {
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/RidgetGenerator.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/RidgetGenerator.java
index ae98117..25febec 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/RidgetGenerator.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/RidgetGenerator.java
@@ -46,6 +46,7 @@ import org.eclipse.text.edits.TextEdit;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
+@SuppressWarnings("restriction")
public class RidgetGenerator {
protected static final String NATURE_JAVA = "org.eclipse.jdt.core.javanature"; //$NON-NLS-1$
protected static final String EXTENSION_JAVA = ".java"; //$NON-NLS-1$
@@ -103,6 +104,7 @@ public class RidgetGenerator {
* @param fullyQualifiedClassName
* @return all found SwtControls, or an empty list
*/
+ @SuppressWarnings("unchecked")
public List<SwtControl> findSwtControls(final String fullyQualifiedClassName) {
final CompilationUnit astNode = findCompilationUnit(fullyQualifiedClassName);
if (null == astNode) {
@@ -135,6 +137,7 @@ public class RidgetGenerator {
* @param controls
* @return true if the given class was found, otherwise false
*/
+ @SuppressWarnings("unchecked")
public boolean generateConfigureRidgets(final String fullyQualifiedControllerClassName,
final List<SwtControl> controls) {
final ICompilationUnit unit = findICompilationUnit(fullyQualifiedControllerClassName);
@@ -175,7 +178,7 @@ public class RidgetGenerator {
private String cleanVariableName(final String ridgetId) {
String cleanVariableName = ridgetId.replaceAll("[^a-zA-Z0-9]", ""); //$NON-NLS-1$ //$NON-NLS-2$
// cut off any digits at beginning of string
- cleanVariableName = cleanVariableName.replaceFirst("^\\d+(.*?)$", "$1");
+ cleanVariableName = cleanVariableName.replaceFirst("^\\d+(.*?)$", "$1"); //$NON-NLS-1$ //$NON-NLS-2$
cleanVariableName = Character.toLowerCase(cleanVariableName.charAt(0)) + cleanVariableName.substring(1);
// FIXME Generator can break, if ridgetId is Java keyword like static or privat
@@ -192,6 +195,7 @@ public class RidgetGenerator {
* @param parentMethod
* @param controls
*/
+ @SuppressWarnings("unchecked")
private void generateGetRidgetCalls(final AST ast, final MethodDeclaration parentMethod,
final List<SwtControl> controls) {
@@ -231,6 +235,7 @@ public class RidgetGenerator {
* @param unit
* @param controls
*/
+ @SuppressWarnings("unchecked")
private void addImportStatements(final AST ast, final CompilationUnit unit, final List<SwtControl> controls) {
for (final SwtControl swtControl : controls) {
if (!hasImportStatement(unit, swtControl.getFullyQualifiedRidgetClassName())) {
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/SWTControlInstantiationVisitor.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/SWTControlInstantiationVisitor.java
index 2eae3b9..1453e86 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/SWTControlInstantiationVisitor.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/SWTControlInstantiationVisitor.java
@@ -76,7 +76,7 @@ public class SWTControlInstantiationVisitor extends ASTVisitor {
final ITypeBinding binding = node.resolveTypeBinding();
final String fullClassName = binding.getQualifiedName();
- if (null != fullClassName && fullClassName.startsWith("org.eclipse.swt.widgets")) {
+ if (null != fullClassName && fullClassName.startsWith("org.eclipse.swt.widgets")) { //$NON-NLS-1$
if (controlBlackList.contains(fullClassName)) {
return false;
@@ -103,12 +103,13 @@ public class SWTControlInstantiationVisitor extends ASTVisitor {
return super.visit(node);
}
+ @SuppressWarnings("unchecked")
private void generateAddUIControlCall(final MethodDeclaration enclosingMethod, final String variableName) {
final AST ast = enclosingMethod.getAST();
final MethodInvocation methodAddUIControl = ast.newMethodInvocation();
- methodAddUIControl.setName(ast.newSimpleName("addUIControl"));
+ methodAddUIControl.setName(ast.newSimpleName("addUIControl")); //$NON-NLS-1$
methodAddUIControl.arguments().add(ast.newSimpleName(variableName));
final StringLiteral ridgetId = ast.newStringLiteral();
ridgetId.setLiteralValue(variableName);
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/StartupEditorListener.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/StartupEditorListener.java
index b293c05..8673cf9 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/StartupEditorListener.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/StartupEditorListener.java
@@ -29,6 +29,7 @@ import org.eclipse.riena.toolbox.assemblyeditor.model.BundleNode;
import org.eclipse.riena.toolbox.assemblyeditor.model.SubModuleNode;
import org.eclipse.riena.toolbox.assemblyeditor.ui.views.AssemblyView;
+@SuppressWarnings("restriction")
public class StartupEditorListener implements IStartup {
public void earlyStartup() {
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/UIControlVisitor.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/UIControlVisitor.java
index 976fa65..f2f1faa 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/UIControlVisitor.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/UIControlVisitor.java
@@ -60,7 +60,7 @@ public class UIControlVisitor extends ASTVisitor {
final String blackListString = Activator.getDefault().getPreferenceStore()
.getString(PreferenceConstants.CONST_CONFIGURE_RIDGETS_BLACKLIST);
if (Util.isGiven(blackListString)) {
- controlBlacklist = Arrays.asList(blackListString.split(";"));
+ controlBlacklist = Arrays.asList(blackListString.split(";")); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IModelService.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IModelService.java
index 2ce494e..b05977b 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IModelService.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/IModelService.java
@@ -19,13 +19,13 @@ import org.eclipse.riena.toolbox.assemblyeditor.model.AssemblyModel;
import org.eclipse.riena.toolbox.assemblyeditor.model.SubModuleNode;
/**
- * Services for retrieving Information from the domainmodel.
+ * Services for retrieving Information of the domainmodel.
*
*/
public interface IModelService {
public Set<String> getAllParentTypeIds(AssemblyModel model);
- public Set<String> getAllTypeIds(AssemblyModel model, AbstractTypedNode nodesToIgnore);
+ public Set<String> getAllTypeIds(AssemblyModel model, AbstractTypedNode<?> nodesToIgnore);
public SubModuleNode findSubModuleByClassName(AssemblyModel model, IProject project, String className);
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/INodeFactory.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/INodeFactory.java
index f7e23f0..9a564da 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/INodeFactory.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/api/INodeFactory.java
@@ -26,13 +26,13 @@ import org.eclipse.riena.toolbox.assemblyeditor.model.SubModuleNode;
public interface INodeFactory {
AssemblyNode createAssembly(BundleNode model);
- SubApplicationNode createSubApplication(AbstractAssemblyNode parent, BundleNode model);
+ SubApplicationNode createSubApplication(AbstractAssemblyNode<?> parent, BundleNode model);
- ModuleGroupNode createModuleGroup(AbstractAssemblyNode parent, BundleNode model);
+ ModuleGroupNode createModuleGroup(AbstractAssemblyNode<?> parent, BundleNode model);
- ModuleNode createModule(AbstractAssemblyNode parent, BundleNode model);
+ ModuleNode createModule(AbstractAssemblyNode<?> parent, BundleNode model);
- SubModuleNode createSubModule(AbstractAssemblyNode parent, BundleNode model);
+ SubModuleNode createSubModule(AbstractAssemblyNode<?> parent, BundleNode model);
RCPPerspective createRcpPerspective(SubApplicationNode parent);
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/AssemblyTreeViewer.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/AssemblyTreeViewer.java
index 8ba8240..e59a4cd 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/AssemblyTreeViewer.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/AssemblyTreeViewer.java
@@ -46,9 +46,9 @@ import org.eclipse.riena.toolbox.assemblyeditor.model.SubModuleNode;
*/
public class AssemblyTreeViewer extends FilteredTree {
- private List<IDirtyListener> dirtyListener;
+ private final List<IDirtyListener> dirtyListener;
- public AssemblyTreeViewer(Composite parent, int style) {
+ public AssemblyTreeViewer(final Composite parent, final int style) {
super(parent, SWT.SINGLE, new PatternFilter(), true);
dirtyListener = new ArrayList<IDirtyListener>();
@@ -56,10 +56,10 @@ public class AssemblyTreeViewer extends FilteredTree {
treeViewer.setLabelProvider(new TreeLabelProvider());
treeViewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- Object selectedNode = selection.getFirstElement();
- boolean expanded = treeViewer.getExpandedState(selectedNode);
+ public void doubleClick(final DoubleClickEvent event) {
+ final IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+ final Object selectedNode = selection.getFirstElement();
+ final boolean expanded = treeViewer.getExpandedState(selectedNode);
if (expanded) {
treeViewer.collapseToLevel(selectedNode, TreeViewer.ALL_LEVELS);
} else {
@@ -77,22 +77,22 @@ public class AssemblyTreeViewer extends FilteredTree {
return treeViewer.getTree();
}
- public boolean addDirtyListener(IDirtyListener e) {
+ public boolean addDirtyListener(final IDirtyListener e) {
return dirtyListener.add(e);
}
- public boolean removeDirtyListener(IDirtyListener e) {
+ public boolean removeDirtyListener(final IDirtyListener e) {
return dirtyListener.remove(e);
}
- private void fireDirtyChanged(boolean isDirty) {
- for (IDirtyListener l : dirtyListener) {
+ private void fireDirtyChanged(final boolean isDirty) {
+ for (final IDirtyListener l : dirtyListener) {
l.dirtyStateChanged(null, isDirty);
}
}
- public void setModel(AssemblyModel model, boolean refresh) {
- Object[] exp = treeViewer.getExpandedElements();
+ public void setModel(final AssemblyModel model, final boolean refresh) {
+ final Object[] exp = treeViewer.getExpandedElements();
treeViewer.setInput(model);
if (refresh) {
treeViewer.refresh();
@@ -104,33 +104,33 @@ public class AssemblyTreeViewer extends FilteredTree {
* Rebuilds the complete Tree from the previously set AssemblyModel.
*/
public void rebuild() {
- Object[] exp = treeViewer.getExpandedElements();
+ final Object[] exp = treeViewer.getExpandedElements();
treeViewer.refresh();
treeViewer.setExpandedElements(exp);
fireDirtyChanged(true);
}
private static class TreeContentProvider implements ITreeContentProvider {
- public Object[] getChildren(Object parentElement) {
- return ((AbstractAssemblyNode) parentElement).getChildren().toArray();
+ public Object[] getChildren(final Object parentElement) {
+ return ((AbstractAssemblyNode<?>) parentElement).getChildren().toArray();
}
- public Object getParent(Object element) {
- return ((AbstractAssemblyNode) element).getParent();
+ public Object getParent(final Object element) {
+ return ((AbstractAssemblyNode<?>) element).getParent();
}
- public boolean hasChildren(Object element) {
- return ((AbstractAssemblyNode) element).hasChildren();
+ public boolean hasChildren(final Object element) {
+ return ((AbstractAssemblyNode<?>) element).hasChildren();
}
- public Object[] getElements(Object inputElement) {
+ public Object[] getElements(final Object inputElement) {
return getChildren(inputElement);
}
public void dispose() {
}
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ public void inputChanged(final Viewer viewer, final Object oldInput, final Object newInput) {
}
}
@@ -139,12 +139,12 @@ public class AssemblyTreeViewer extends FilteredTree {
*
*/
private static class TreeLabelProvider extends LabelProvider {
- private Map<Class, Image> images;
- private Image imgAssemblyAutostart;
- private Image imgAssembly;
+ private final Map<Class<?>, Image> images;
+ private final Image imgAssemblyAutostart;
+ private final Image imgAssembly;
public TreeLabelProvider() {
- images = new HashMap<Class, Image>();
+ images = new HashMap<Class<?>, Image>();
imgAssembly = Activator.getImageDescriptor("icons/ass.png").createImage(); //$NON-NLS-1$
imgAssemblyAutostart = Activator.getImageDescriptor("icons/ass_s.png").createImage(); //$NON-NLS-1$
@@ -156,21 +156,21 @@ public class AssemblyTreeViewer extends FilteredTree {
}
@Override
- public String getText(Object element) {
- return ((AbstractAssemblyNode) element).getTreeLabel();
+ public String getText(final Object element) {
+ return ((AbstractAssemblyNode<?>) element).getTreeLabel();
}
@Override
- public Image getImage(Object element) {
- AbstractAssemblyNode ass = (AbstractAssemblyNode) element;
+ public Image getImage(final Object element) {
+ final AbstractAssemblyNode<?> ass = (AbstractAssemblyNode<?>) element;
if (null != ass) {
- Image img = images.get(ass.getClass());
+ final Image img = images.get(ass.getClass());
if (null != img) {
return img;
}
if (ass instanceof AssemblyNode) {
- AssemblyNode assNode = (AssemblyNode) ass;
+ final AssemblyNode assNode = (AssemblyNode) ass;
return null != assNode.getAutostartSequence() ? imgAssemblyAutostart : imgAssembly;
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/DetailSection.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/DetailSection.java
index 388526a..b3fe423 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/DetailSection.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/DetailSection.java
@@ -75,7 +75,7 @@ public class DetailSection extends Composite {
dirtyListener = new ArrayList<IDirtyListener>();
- emptyComposite = new AbstractDetailComposite(this, "", null) {
+ emptyComposite = new AbstractDetailComposite(this, "", null) { //$NON-NLS-1$
@Override
public void unbind() {
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/IDirtyListener.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/IDirtyListener.java
index 3937cca..673ea3b 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/IDirtyListener.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/IDirtyListener.java
@@ -12,6 +12,16 @@ package org.eclipse.riena.toolbox.assemblyeditor.ui;
import org.eclipse.riena.toolbox.assemblyeditor.model.AbstractAssemblyNode;
+/**
+ * The listener interface for receiving dirty events.
+ */
public interface IDirtyListener {
- void dirtyStateChanged(AbstractAssemblyNode node, boolean isDirty);
+ /**
+ * @param node
+ * the node that changed
+ * @param isDirty
+ * <code>true</code> if the content changed otherwise
+ * <code>false</code>
+ */
+ void dirtyStateChanged(AbstractAssemblyNode<?> node, boolean isDirty);
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/IconSelectorText.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/IconSelectorText.java
index a3eddb0..9823f39 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/IconSelectorText.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/IconSelectorText.java
@@ -28,6 +28,7 @@ import org.eclipse.ui.model.WorkbenchLabelProvider;
* selectable by the user.
*
*/
+@SuppressWarnings("restriction")
public class IconSelectorText extends TextButtonComposite {
private IProject project;
@@ -77,8 +78,8 @@ public class IconSelectorText extends TextButtonComposite {
public boolean select(final Viewer viewer, final Object parentElement, final Object element) {
if (element instanceof File) {
final File file = (File) element;
- return (file.getName().endsWith(".gif") || file.getName().endsWith(".jpg") || file.getName().endsWith(
- ".png"));
+ return (file.getName().endsWith(".gif") || file.getName().endsWith(".jpg") || file.getName().endsWith( //$NON-NLS-1$ //$NON-NLS-2$
+ ".png")); //$NON-NLS-1$
}
return true;
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/OpenClassLink.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/OpenClassLink.java
index 3d2c3bf..2232cc8 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/OpenClassLink.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/OpenClassLink.java
@@ -28,6 +28,7 @@ import org.eclipse.ui.PartInitException;
import org.eclipse.riena.toolbox.assemblyeditor.RidgetGenerator;
import org.eclipse.riena.toolbox.assemblyeditor.model.SubModuleNode;
+@SuppressWarnings("restriction")
public class OpenClassLink extends Composite {
private Link lnk;
@@ -40,7 +41,7 @@ public class OpenClassLink extends Composite {
setLayout(new FillLayout());
lnk = new Link(this, SWT.None);
- lnk.setText("<a>" + text + "</a>");
+ lnk.setText("<a>" + text + "</a>"); //$NON-NLS-1$ //$NON-NLS-2$
lnk.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(final SelectionEvent e) {
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/ToolboxTransfer.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/ToolboxTransfer.java
index 4cfba69..d2b4d62 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/ToolboxTransfer.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/ToolboxTransfer.java
@@ -24,6 +24,6 @@ public class ToolboxTransfer extends ByteArrayTransfer {
@Override
protected String[] getTypeNames() {
- return new String[] { "FOO" };
+ return new String[] { "FOO" }; //$NON-NLS-1$
}
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/AbstractDetailComposite.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/AbstractDetailComposite.java
index bd19a80..b51eead 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/AbstractDetailComposite.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/AbstractDetailComposite.java
@@ -23,7 +23,6 @@ import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Canvas;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
@@ -38,7 +37,7 @@ import org.eclipse.riena.toolbox.assemblyeditor.ui.UIControlsFactory;
import org.eclipse.riena.toolbox.assemblyeditor.ui.VerifyTypeIdText;
import org.eclipse.riena.toolbox.assemblyeditor.ui.ViewSelectorText;
-public abstract class AbstractDetailComposite<T extends AbstractAssemblyNode> extends Composite {
+public abstract class AbstractDetailComposite<T extends AbstractAssemblyNode<?>> extends Composite {
protected T node;
protected Color workareaBackground;
private final Color headerBackground;
@@ -158,15 +157,6 @@ public abstract class AbstractDetailComposite<T extends AbstractAssemblyNode> ex
GridDataFactory.fillDefaults().grab(true, true).align(SWT.RIGHT, SWT.CENTER).applyTo(lblImageRight);
}
- private class Separator extends Canvas {
- public Separator(final Composite parent) {
- super(parent, SWT.None);
- setBackground(getDisplay().getSystemColor(SWT.COLOR_BLACK));
- GridDataFactory.fillDefaults().span(2, 1).align(SWT.CENTER, SWT.END).hint(2000, 1).grab(true, false)
- .applyTo(this);
- }
- }
-
/**
* This method is called once to create the workarea.
*/
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/AssemblyComposite.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/AssemblyComposite.java
index 87c97f0..e41ce78 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/AssemblyComposite.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/AssemblyComposite.java
@@ -34,7 +34,7 @@ public class AssemblyComposite extends AbstractDetailComposite<AssemblyNode> {
private ContentProposalAdapter contentProposalTypeId;
public AssemblyComposite(final Composite parent) {
- super(parent, "", "ass_re.png");
+ super(parent, "", "ass_re.png"); //$NON-NLS-1$ //$NON-NLS-2$
}
@Override
@@ -53,9 +53,9 @@ public class AssemblyComposite extends AbstractDetailComposite<AssemblyNode> {
txtName.setText(getTextSave(node.getName()));
if (null != node.getAutostartSequence()) {
- txtAutostartsequence.setText(getTextSave(node.getAutostartSequence() + ""));
+ txtAutostartsequence.setText(getTextSave(node.getAutostartSequence() + "")); //$NON-NLS-1$
} else {
- txtAutostartsequence.setText("");
+ txtAutostartsequence.setText(""); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/BundleComposite.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/BundleComposite.java
index c8d5233..e518bda 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/BundleComposite.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/BundleComposite.java
@@ -20,7 +20,7 @@ public class BundleComposite extends AbstractDetailComposite<BundleNode> {
private Text txtName;
public BundleComposite(final Composite parent) {
- super(parent, "", "");
+ super(parent, "", ""); //$NON-NLS-1$ //$NON-NLS-2$
}
@Override
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/ModuleComposite.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/ModuleComposite.java
index 669d4c8..f27acfb 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/ModuleComposite.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/ModuleComposite.java
@@ -29,7 +29,7 @@ public class ModuleComposite extends AbstractDetailComposite<ModuleNode> {
private Text txtName;
public ModuleComposite(final Composite parent) {
- super(parent, "module_li.png", "module_re.png");
+ super(parent, "module_li.png", "module_re.png"); //$NON-NLS-1$ //$NON-NLS-2$
}
@Override
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/ModuleGroupComposite.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/ModuleGroupComposite.java
index f0da3bf..09a8d77 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/ModuleGroupComposite.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/ModuleGroupComposite.java
@@ -23,7 +23,7 @@ public class ModuleGroupComposite extends AbstractDetailComposite<ModuleGroupNod
private Text txtName;
public ModuleGroupComposite(final Composite parent) {
- super(parent, "modulegroup_li.png", "modulegroup_re.png");
+ super(parent, "modulegroup_li.png", "modulegroup_re.png"); //$NON-NLS-1$ //$NON-NLS-2$
}
@Override
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/SubApplicationComposite.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/SubApplicationComposite.java
index eaa623b..4c81c37 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/SubApplicationComposite.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/SubApplicationComposite.java
@@ -33,7 +33,7 @@ public class SubApplicationComposite extends AbstractDetailComposite<SubApplicat
private IdSelectorText txtPerspective;
public SubApplicationComposite(final Composite parent) {
- super(parent, "subapplication_li.png", "subapplication_re.png");
+ super(parent, "subapplication_li.png", "subapplication_re.png"); //$NON-NLS-1$ //$NON-NLS-2$
}
@Override
@@ -54,7 +54,7 @@ public class SubApplicationComposite extends AbstractDetailComposite<SubApplicat
if (Util.isGiven(node.getPerspective())) {
txtPerspective.setCurrentId(node.getPerspective());
} else {
- txtPerspective.setCurrentId("");
+ txtPerspective.setCurrentId(""); //$NON-NLS-1$
}
txtNodeId.getText().setText(getTextSave(node.getNodeId()));
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/SubModuleComposite.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/SubModuleComposite.java
index 13a5237..b0db6d8 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/SubModuleComposite.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/composites/SubModuleComposite.java
@@ -42,6 +42,7 @@ import org.eclipse.riena.toolbox.assemblyeditor.ui.TextButtonComposite;
import org.eclipse.riena.toolbox.assemblyeditor.ui.UIControlsFactory;
import org.eclipse.riena.toolbox.assemblyeditor.ui.VerifyTypeIdText;
+@SuppressWarnings("restriction")
public class SubModuleComposite extends AbstractDetailComposite<SubModuleNode> {
private Text txtName;
@@ -72,8 +73,8 @@ public class SubModuleComposite extends AbstractDetailComposite<SubModuleNode> {
txtView.getText().setText(getTextSave(node.getRcpView().getId()));
txtView.setCurrentId(node.getRcpView().getId());
} else {
- txtView.getText().setText("");
- txtView.setCurrentId("");
+ txtView.getText().setText(""); //$NON-NLS-1$
+ txtView.setCurrentId(""); //$NON-NLS-1$
}
txtController.getText().setText(getTextSave(node.getController()));
@@ -196,7 +197,7 @@ public class SubModuleComposite extends AbstractDetailComposite<SubModuleNode> {
if (Util.isGiven(controllerName)) {
dia.setInitialPattern(controllerName, FilteredItemsSelectionDialog.FULL_SELECTION);
} else {
- dia.setInitialPattern(project.getName() + ".controller.",
+ dia.setInitialPattern(project.getName() + ".controller.", //$NON-NLS-1$
FilteredItemsSelectionDialog.FULL_SELECTION);
}
@@ -213,6 +214,7 @@ public class SubModuleComposite extends AbstractDetailComposite<SubModuleNode> {
});
}
+ @SuppressWarnings("unused")
public String getControllerName() {
return controllerName;
}
@@ -221,6 +223,7 @@ public class SubModuleComposite extends AbstractDetailComposite<SubModuleNode> {
this.controllerName = controllerName;
}
+ @SuppressWarnings("unused")
public IProject getProject() {
return project;
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/PreferenceInitializer.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/PreferenceInitializer.java
index 7a4c39d..a842480 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/PreferenceInitializer.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/PreferenceInitializer.java
@@ -12,12 +12,12 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
@Override
public void initializeDefaultPreferences() {
final IPreferenceStore store = Activator.getDefault().getPreferenceStore();
- store.setDefault(PreferenceConstants.CONST_CUSTOM_UI_CONTROLS_FACTORY, "");
- store.setDefault(PreferenceConstants.CONST_GENERATE_CONTROLLER_PACKAGE_NAME, "controller");
- store.setDefault(PreferenceConstants.CONST_GENERATE_VIEW_PACKAGE_NAME, "views");
+ store.setDefault(PreferenceConstants.CONST_CUSTOM_UI_CONTROLS_FACTORY, ""); //$NON-NLS-1$
+ store.setDefault(PreferenceConstants.CONST_GENERATE_CONTROLLER_PACKAGE_NAME, "controller"); //$NON-NLS-1$
+ store.setDefault(PreferenceConstants.CONST_GENERATE_VIEW_PACKAGE_NAME, "views"); //$NON-NLS-1$
store.setDefault(PreferenceConstants.CONST_CONFIGURE_RIDGETS_BLACKLIST,
- "org.eclipse.swt.widgets.Label;org.eclipse.swt.widgets.Composite");
+ "org.eclipse.swt.widgets.Label;org.eclipse.swt.widgets.Composite"); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/ToolboxConfigurationPreferencePage.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/ToolboxConfigurationPreferencePage.java
index b1cd503..d560301 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/ToolboxConfigurationPreferencePage.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/preferences/ToolboxConfigurationPreferencePage.java
@@ -80,7 +80,7 @@ public class ToolboxConfigurationPreferencePage extends FieldEditorPreferencePag
final String item = items[i];
bob.append(item);
if (i < items.length - 1) {
- bob.append(";");
+ bob.append(";"); //$NON-NLS-1$
}
}
return bob.toString();
@@ -88,8 +88,8 @@ public class ToolboxConfigurationPreferencePage extends FieldEditorPreferencePag
@Override
protected String getNewInputObject() {
- final InputDialog dlg = new InputDialog(Display.getCurrent().getActiveShell(), "",
- "Enter a fullyqualified Classname", "", null);
+ final InputDialog dlg = new InputDialog(Display.getCurrent().getActiveShell(), "", //$NON-NLS-1$
+ "Enter a fully qualified Classname", "", null); //$NON-NLS-2$
if (dlg.open() == Window.OK) {
return dlg.getValue();
}
@@ -98,7 +98,7 @@ public class ToolboxConfigurationPreferencePage extends FieldEditorPreferencePag
@Override
protected String[] parseString(final String stringList) {
- return stringList.split(";");
+ return stringList.split(";"); //$NON-NLS-1$
}
}
} \ No newline at end of file
diff --git a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/views/AssemblyView.java b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/views/AssemblyView.java
index d99b071..04d8920 100644
--- a/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/views/AssemblyView.java
+++ b/org.eclipse.riena.toolbox/src/org/eclipse/riena/toolbox/assemblyeditor/ui/views/AssemblyView.java
@@ -80,6 +80,7 @@ import org.eclipse.riena.ui.swt.MessageBox;
* the editor for the currently selected node on the right side.
*
*/
+@SuppressWarnings("restriction")
public class AssemblyView extends ViewPart implements ISaveablePart {
/**
* The ID of the view as specified by the extension.
@@ -138,7 +139,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
sashForm.setWeights(new int[] { 30, 70 });
detailSection.addDirtyListener(new IDirtyListener() {
- public void dirtyStateChanged(final AbstractAssemblyNode node, final boolean isDirty) {
+ public void dirtyStateChanged(final AbstractAssemblyNode<?> node, final boolean isDirty) {
node.getBundle().setDirty(true);
setDirty(isDirty);
}
@@ -163,7 +164,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
}
private void checkActionEnabledState() {
- final AbstractAssemblyNode treeNode = getSelectedNode();
+ final AbstractAssemblyNode<?> treeNode = getSelectedNode();
if (null == treeNode) {
return;
@@ -204,7 +205,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
// if the assemblyNode already has a child, only child nodes of the same type are allowed
if (!assNode.getChildren().isEmpty()) {
- final AbstractTypedNode firstChild = assNode.getChildren().get(0);
+ final AbstractTypedNode<?> firstChild = assNode.getChildren().get(0);
if (firstChild instanceof SubApplicationNode) {
addSubAppAction.setEnabled(true);
@@ -346,7 +347,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
assemblyTree.getTreeViewer().addSelectionChangedListener(new ISelectionChangedListener() {
public void selectionChanged(final SelectionChangedEvent event) {
checkActionEnabledState();
- final AbstractAssemblyNode node = getSelectedNode();
+ final AbstractAssemblyNode<?> node = getSelectedNode();
detailSection.showDetails(node);
}
});
@@ -360,7 +361,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
getSite().setSelectionProvider(assemblyTree.getTreeViewer());
assemblyTree.addDirtyListener(new IDirtyListener() {
- public void dirtyStateChanged(final AbstractAssemblyNode node, final boolean isDirty) {
+ public void dirtyStateChanged(final AbstractAssemblyNode<?> node, final boolean isDirty) {
setDirty(isDirty);
}
});
@@ -405,18 +406,18 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
checkActionEnabledState();
assemblyTree.rebuild();
- final AbstractAssemblyNode selectedNode = getSelectedNode();
+ final AbstractAssemblyNode<?> selectedNode = getSelectedNode();
if (null != selectedNode) {
detailSection.update(selectedNode);
}
}
- public void expandNode(final AbstractAssemblyNode parentNode) {
+ public void expandNode(final AbstractAssemblyNode<?> parentNode) {
assemblyTree.getTreeViewer().setExpandedState(parentNode, true);
}
- public void selectNode(final AbstractAssemblyNode node) {
+ public void selectNode(final AbstractAssemblyNode<?> node) {
assemblyTree.getTreeViewer().expandToLevel(node, AbstractTreeViewer.ALL_LEVELS);
assemblyTree.getTreeViewer().setSelection(new StructuredSelection(node));
}
@@ -436,12 +437,12 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
Activator.getDefault().getDataProvider().addResourceChangeListener(changeListener);
}
- public AbstractAssemblyNode getSelectedNode() {
+ public AbstractAssemblyNode<?> getSelectedNode() {
final ISelection sel = assemblyTree.getTreeViewer().getSelection();
if (sel instanceof StructuredSelection) {
final StructuredSelection selTree = (StructuredSelection) sel;
- final AbstractAssemblyNode selectedNode = (AbstractAssemblyNode) selTree.getFirstElement();
+ final AbstractAssemblyNode<?> selectedNode = (AbstractAssemblyNode<?>) selTree.getFirstElement();
return selectedNode;
}
return null;
@@ -477,17 +478,18 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
protected BundleNode findBundle() {
final AssemblyView assemblyView = (AssemblyView) PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getActivePage().findView(AssemblyView.ID);
- final AbstractAssemblyNode treeNode = assemblyView.getSelectedNode();
+ final AbstractAssemblyNode<?> treeNode = assemblyView.getSelectedNode();
if (null == treeNode) {
return null;
}
- final AbstractAssemblyNode current = treeNode;
+ final AbstractAssemblyNode<?> current = treeNode;
final BundleNode bundle = current.getBundle();
return bundle;
}
+ @SuppressWarnings("rawtypes")
@Override
public final void run() {
final AssemblyView assemblyView = (AssemblyView) PlatformUI.getWorkbench().getActiveWorkbenchWindow()
@@ -526,7 +528,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
public void run() {
final AssemblyView assemblyView = (AssemblyView) PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getActivePage().findView(AssemblyView.ID);
- final AbstractAssemblyNode selectedNode = assemblyView.getSelectedNode();
+ final AbstractAssemblyNode<?> selectedNode = assemblyView.getSelectedNode();
if (selectedNode instanceof SubModuleNode) {
deleteSubModuleNode(assemblyView, selectedNode);
@@ -534,7 +536,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
} else if (selectedNode instanceof SubApplicationNode) {
deleteSubApplicationNode(assemblyView, selectedNode);
} else {
- if (MessageDialog.openQuestion(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "",
+ if (MessageDialog.openQuestion(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "", //$NON-NLS-1$
TITLE)) {
selectedNode.getBundle().setDirty(true);
deleteNode(assemblyView, selectedNode);
@@ -546,7 +548,8 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
* @param assemblyView
* @param selectedNode
*/
- private void deleteSubApplicationNode(final AssemblyView assemblyView, final AbstractAssemblyNode selectedNode) {
+ private void deleteSubApplicationNode(final AssemblyView assemblyView,
+ final AbstractAssemblyNode<?> selectedNode) {
final SubApplicationNode subApp = (SubApplicationNode) selectedNode;
final String[] options = new String[] { OPTION_DELETE_NODE, OPTION_UNREGISTER_PERSPECTIVE };
@@ -575,7 +578,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
* @param assemblyView
* @param selectedNode
*/
- private void deleteSubModuleNode(final AssemblyView assemblyView, final AbstractAssemblyNode selectedNode) {
+ private void deleteSubModuleNode(final AssemblyView assemblyView, final AbstractAssemblyNode<?> selectedNode) {
final SubModuleNode subMod = (SubModuleNode) selectedNode;
final String[] options = new String[] { OPTION_DELETE_NODE, OPTION_DELETE_VIEW_CLASS,
@@ -610,11 +613,11 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
}
}
- private void deleteNode(final AssemblyView assemblyView, final AbstractAssemblyNode treeNode) {
+ private void deleteNode(final AssemblyView assemblyView, final AbstractAssemblyNode<?> treeNode) {
// save the selection, to reset it after the tree is rebuilt
- AbstractAssemblyNode newSelection = treeNode.getParent();
+ AbstractAssemblyNode<?> newSelection = treeNode.getParent();
if (treeNode.hasPreviousSibling()) {
- newSelection = (AbstractAssemblyNode) treeNode.getPreviousSibling();
+ newSelection = (AbstractAssemblyNode<?>) treeNode.getPreviousSibling();
}
treeNode.delete();
@@ -632,7 +635,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
}
@Override
- public AbstractAssemblyNode createNode(final AbstractAssemblyNode parent) {
+ public SubModuleNode createNode(@SuppressWarnings("rawtypes") final AbstractAssemblyNode parent) {
return nodeFactory.createSubModule(parent, findBundle());
}
}
@@ -645,7 +648,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
}
@Override
- public AbstractAssemblyNode createNode(final AbstractAssemblyNode parent) {
+ public ModuleNode createNode(@SuppressWarnings("rawtypes") final AbstractAssemblyNode parent) {
return nodeFactory.createModule(parent, findBundle());
}
}
@@ -658,7 +661,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
}
@Override
- public AbstractAssemblyNode createNode(final AbstractAssemblyNode parent) {
+ public AssemblyNode createNode(@SuppressWarnings("rawtypes") final AbstractAssemblyNode parent) {
return nodeFactory.createAssembly(findBundle());
}
}
@@ -671,7 +674,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
}
@Override
- public AbstractAssemblyNode createNode(final AbstractAssemblyNode parent) {
+ public ModuleGroupNode createNode(@SuppressWarnings("rawtypes") final AbstractAssemblyNode parent) {
return nodeFactory.createModuleGroup(parent, findBundle());
}
}
@@ -684,7 +687,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
}
@Override
- public AbstractAssemblyNode createNode(final AbstractAssemblyNode parent) {
+ public SubApplicationNode createNode(@SuppressWarnings("rawtypes") final AbstractAssemblyNode parent) {
return nodeFactory.createSubApplication(parent, findBundle());
}
}
@@ -724,7 +727,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
private static class MoveNodeUpAction extends Action {
public MoveNodeUpAction() {
- setImageDescriptor(Activator.getImageDescriptor("/icons/move_up.gif"));
+ setImageDescriptor(Activator.getImageDescriptor("/icons/move_up.gif")); //$NON-NLS-1$
setId("org.eclipse.riena.toolbox.assemblyeditor.ui.views.movenodeup.action"); //$NON-NLS-1$
setToolTipText("Moves the selected node up");
}
@@ -740,7 +743,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
return;
}
- final AbstractAssemblyNode selectedNode = (AbstractAssemblyNode) sel.getFirstElement();
+ final AbstractAssemblyNode<?> selectedNode = (AbstractAssemblyNode<?>) sel.getFirstElement();
selectedNode.moveUp();
assemblyView.updateTreeAndDetailSection();
}
@@ -748,7 +751,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
private static class MoveNodeDownAction extends Action {
public MoveNodeDownAction() {
- setImageDescriptor(Activator.getImageDescriptor("/icons/move_down.gif"));
+ setImageDescriptor(Activator.getImageDescriptor("/icons/move_down.gif")); //$NON-NLS-1$
setId("org.eclipse.riena.toolbox.assemblyeditor.ui.views.movenodedown.action"); //$NON-NLS-1$
setToolTipText("Moves the selected node down");
}
@@ -764,7 +767,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
return;
}
- final AbstractAssemblyNode selectedNode = (AbstractAssemblyNode) sel.getFirstElement();
+ final AbstractAssemblyNode<?> selectedNode = (AbstractAssemblyNode<?>) sel.getFirstElement();
selectedNode.moveDown();
assemblyView.updateTreeAndDetailSection();
}
@@ -788,7 +791,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
return;
}
- final AbstractAssemblyNode selectedNode = (AbstractAssemblyNode) sel.getFirstElement();
+ final AbstractAssemblyNode<?> selectedNode = (AbstractAssemblyNode<?>) sel.getFirstElement();
if (selectedNode instanceof SubModuleNode) {
final RCPView rcpView = ((SubModuleNode) selectedNode).getRcpView();
@@ -831,7 +834,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
return;
}
- final AbstractAssemblyNode selectedNode = (AbstractAssemblyNode) sel.getFirstElement();
+ final AbstractAssemblyNode<?> selectedNode = (AbstractAssemblyNode<?>) sel.getFirstElement();
if (selectedNode instanceof SubModuleNode) {
final SubModuleNode submod = (SubModuleNode) selectedNode;
@@ -857,7 +860,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
return;
}
- final AbstractAssemblyNode selectedNode = (AbstractAssemblyNode) sel.getFirstElement();
+ final AbstractAssemblyNode<?> selectedNode = (AbstractAssemblyNode<?>) sel.getFirstElement();
if (selectedNode instanceof SubModuleNode) {
final SubModuleNode submod = (SubModuleNode) selectedNode;
@@ -870,7 +873,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
private static class GenerateAddUIControlCallsAction extends Action {
public GenerateAddUIControlCallsAction() {
- setText("Generate missing addUIControl Calls");
+ setText("Generate missing addUIControl calls");
setId("org.eclipse.riena.toolbox.assemblyeditor.ui.views.generateadduicontrolcalls.action"); //$NON-NLS-1$
}
@@ -885,14 +888,14 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
return;
}
- final AbstractAssemblyNode selectedNode = (AbstractAssemblyNode) sel.getFirstElement();
+ final AbstractAssemblyNode<?> selectedNode = (AbstractAssemblyNode<?>) sel.getFirstElement();
if (selectedNode instanceof SubModuleNode) {
final SubModuleNode submod = (SubModuleNode) selectedNode;
if (null != submod.getRcpView() && null != submod.getRcpView().getViewClass()) {
final AddUIControlCallGenerator generator = new AddUIControlCallGenerator(selectedNode.getBundle()
.getProject());
- final boolean ret = generator.generateAddUIControlCalls(submod.getRcpView().getViewClass());
+ generator.generateAddUIControlCalls(submod.getRcpView().getViewClass());
}
}
}
@@ -901,13 +904,13 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
private class RefreshAction extends Action {
public RefreshAction() {
setToolTipText("Reload all plugin.xml");
- setImageDescriptor(Activator.getImageDescriptor("/icons/refresh.png"));
+ setImageDescriptor(Activator.getImageDescriptor("/icons/refresh.png")); //$NON-NLS-1$
setId("org.eclipse.riena.toolbox.assemblyeditor.ui.views.refresh.action"); //$NON-NLS-1$
}
@Override
public void run() {
- final AbstractAssemblyNode selectedNode = getSelectedNode();
+ final AbstractAssemblyNode<?> selectedNode = getSelectedNode();
final AssemblyModel model = Activator.getDefault().getDataProvider().createData();
Activator.getDefault().setAssemblyModel(model);
@@ -932,7 +935,7 @@ public class AssemblyView extends ViewPart implements ISaveablePart {
@Override
public void run() {
- final AbstractAssemblyNode selectedNode = getSelectedNode();
+ final AbstractAssemblyNode<?> selectedNode = getSelectedNode();
if (selectedNode instanceof SubApplicationNode) {
final SubApplicationNode subapp = (SubApplicationNode) selectedNode;