[jbosstools-commits] JBoss Tools SVN: r16306 - in trunk: as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui and 38 other directories.

Author: sflanigan Date: 2009-07-01 01:00:51 -0400 (Wed, 01 Jul 2009) New Revision: 16306 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/messages.properties trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Messages.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/messages.properties trunk/examples/plugins/org.jboss.tools.project.examples/.settings/ trunk/examples/plugins/org.jboss.tools.project.examples/.settings/org.eclipse.jdt.core.prefs trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/src/org/jboss/tools/labs/pde/sourceprovider/Messages.java trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/src/org/jboss/tools/labs/pde/sourceprovider/messages.properties trunk/portlet/plugins/org.jboss.tools.portlet.core/.settings/ trunk/portlet/plugins/org.jboss.tools.portlet.core/.settings/org.eclipse.jdt.core.prefs trunk/portlet/plugins/org.jboss.tools.portlet.ui/.settings/ trunk/portlet/plugins/org.jboss.tools.portlet.ui/.settings/org.eclipse.jdt.core.prefs trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/.settings/ trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/.settings/org.eclipse.jdt.core.prefs trunk/ws/plugins/org.jboss.tools.ws.core/.settings/ trunk/ws/plugins/org.jboss.tools.ws.core/.settings/org.eclipse.jdt.core.prefs trunk/ws/plugins/org.jboss.tools.ws.creation.ui/.settings/ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/Messages.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages.properties Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/Activator.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/DependencyPageExtensionManager.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/J2EEDependenciesPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/impl/EarModuleDependencyPageProvider.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.settings/org.eclipse.jdt.core.prefs trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Activator.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowEditor.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/ConnectionImpl.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/RuleFlowProcess.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/StartNode.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/SubProcessNode.java trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/.settings/org.eclipse.jdt.core.prefs trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/src/org/jboss/tools/labs/pde/sourceprovider/EclipseSourceContainerType.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/xpl/NewJavaClassWizardPageEx.java trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/src/org/jboss/tools/eclipse/as/tptp/PICollectorFiltration.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JBossWSCorePlugin.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/.settings/org.eclipse.jdt.core.prefs trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/JBossWSCreationCore.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/Java2WSCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/ClasspathParser.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/WSDLPropertyReader.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/CreationUIPlugin.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSRuntimeConfigBlock.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSConfigWidgetFactory.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSProviderInvokeConfigWidgetFactory.java trunk/ws/plugins/org.jboss.tools.ws.ui/.settings/org.eclipse.jdt.core.prefs trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/JBossWSUIPlugin.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/UIUtils.java Log: https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English strings Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/Activator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/Activator.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/Activator.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -9,7 +9,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.wtp.override.core"; + public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.wtp.override.core"; //$NON-NLS-1$ // The shared instance private static Activator plugin; Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/Messages.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/Messages.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.wtp.override.ui; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.wtp.override.ui.messages"; //$NON-NLS-1$ + public static String AddModuleDependenciesPropertiesPage_AddProjectButton; + public static String AddModuleDependenciesPropertiesPage_DeployPathColumn; + public static String AddModuleDependenciesPropertiesPage_RemoveSelectedButton; + public static String AddModuleDependenciesPropertiesPage_SelectAProjectTitle; + public static String AddModuleDependenciesPropertiesPage_SourceColumn; + public static String J2EEDependenciesPage_Description; + public static String J2EEDependenciesPage_ErrorCheckingFacets; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/messages.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/messages.properties 2009-07-01 05:00:51 UTC (rev 16306) @@ -0,0 +1,7 @@ +AddModuleDependenciesPropertiesPage_AddProjectButton=Add Project... +AddModuleDependenciesPropertiesPage_DeployPathColumn=Deploy Path +AddModuleDependenciesPropertiesPage_RemoveSelectedButton=Remove selected... +AddModuleDependenciesPropertiesPage_SelectAProjectTitle=Select a Project +AddModuleDependenciesPropertiesPage_SourceColumn=Source +J2EEDependenciesPage_Description=ModuleDependency Page Description +J2EEDependenciesPage_ErrorCheckingFacets=Error Checking Project Facets Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -93,6 +93,7 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; +import org.jboss.ide.eclipse.as.wtp.override.ui.Messages; public class AddModuleDependenciesPropertiesPage implements Listener, IModuleDependenciesControl { @@ -197,14 +198,14 @@ } protected void createPushButtons() { - projectButton = createPushButton("Add Project..."); + projectButton = createPushButton(Messages.AddModuleDependenciesPropertiesPage_AddProjectButton); projectJarButton = createPushButton(J2EEUIMessages .getResourceString(J2EEUIMessages.PROJECT_JAR)); externalJarButton = createPushButton(J2EEUIMessages .getResourceString(J2EEUIMessages.EXTERNAL_JAR)); addVariableButton = createPushButton(J2EEUIMessages .getResourceString(J2EEUIMessages.ADDVARIABLE)); - removeButton = createPushButton("Remove selected..."); + removeButton = createPushButton(Messages.AddModuleDependenciesPropertiesPage_RemoveSelectedButton); } protected Button createPushButton(String label) { @@ -282,7 +283,7 @@ switch (event.type) { case SWT.MouseDown: Event e = new Event(); - e.item = (TableItem) label.getData("_TABLEITEM"); + e.item = (TableItem) label.getData("_TABLEITEM"); //$NON-NLS-1$ table.setSelection(new TableItem[] { (TableItem) e.item }); table.notifyListeners(SWT.Selection, e); shell.dispose(); @@ -405,7 +406,7 @@ } public Object getValue(Object element, String property) { - return objectToRuntimePath.get(element) == null ? new Path("/") + return objectToRuntimePath.get(element) == null ? new Path("/") //$NON-NLS-1$ .toString() : objectToRuntimePath.get(element); } @@ -439,9 +440,9 @@ IProject selected = (IProject) d.getFirstResult(); Object selected2 = ModuleCoreNature.isFlexibleProject(selected) ? ComponentCore.createComponent(selected) : selected; - IPath path = new Path("/"); + IPath path = new Path("/"); //$NON-NLS-1$ path = path.append(selected2 instanceof IVirtualComponent ? - getVirtualComponentNameWithExtension((IVirtualComponent)selected2) : selected.getName() + ".jar"); + getVirtualComponentNameWithExtension((IVirtualComponent)selected2) : selected.getName() + ".jar"); //$NON-NLS-1$ objectToRuntimePath.put(selected2, path.toString()); refresh(); TableItem[] items = availableComponentsViewer.getTable().getItems(); @@ -456,7 +457,7 @@ ITreeContentProvider contentProvider) { super(parent, labelProvider, contentProvider); setAllowMultiple(false); - setTitle("Select a Project"); + setTitle(Messages.AddModuleDependenciesPropertiesPage_SelectAProjectTitle); setInput(ResourcesPlugin.getWorkspace()); } } @@ -552,7 +553,7 @@ if( f != null ) name = new Path(f.getAbsolutePath()).lastSegment(); } - this.objectToRuntimePath.put(archive, new Path("/").append(name).toString()); + this.objectToRuntimePath.put(archive, new Path("/").append(name).toString()); //$NON-NLS-1$ availableComponentsViewer.add(archive); } else { // TODO should inform user that they selected an already referenced @@ -633,11 +634,11 @@ availableComponentsViewer.setSorter(null); TableColumn bndColumn = new TableColumn(table, SWT.NONE, 0); - bndColumn.setText("Deploy Path"); + bndColumn.setText(Messages.AddModuleDependenciesPropertiesPage_DeployPathColumn); bndColumn.setResizable(true); TableColumn projectColumn = new TableColumn(table, SWT.NONE, 1); - projectColumn.setText("Source"); + projectColumn.setText(Messages.AddModuleDependenciesPropertiesPage_SourceColumn); projectColumn.setResizable(true); tableLayout.layout(table, true); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/DependencyPageExtensionManager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/DependencyPageExtensionManager.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/DependencyPageExtensionManager.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -37,7 +37,7 @@ HashMap<String, IDependencyPageProvider> temp = new HashMap<String, IDependencyPageProvider>(); IExtensionRegistry registry = Platform.getExtensionRegistry(); IConfigurationElement[] cf = registry.getConfigurationElementsFor( - WTPOveridePlugin.PLUGIN_ID, "moduleDependencyPropertyPage"); + WTPOveridePlugin.PLUGIN_ID, "moduleDependencyPropertyPage"); //$NON-NLS-1$ for( int i = 0; i < cf.length; i++ ) { try { temp.put(cf[i].getAttribute("id"), //$NON-NLS-1$ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/J2EEDependenciesPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/J2EEDependenciesPage.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/J2EEDependenciesPage.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -25,6 +25,7 @@ import org.eclipse.ui.dialogs.PropertyPage; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.jboss.ide.eclipse.as.wtp.override.ui.Messages; import org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.impl.EarModuleDependenciesPropertyPage; @@ -45,7 +46,7 @@ */ public class J2EEDependenciesPage extends PropertyPage { - public String DESCRIPTION = "ModuleDependency Page Description"; + public String DESCRIPTION = Messages.J2EEDependenciesPage_Description; private IProject project; private IModuleDependenciesControl[] controls = new IModuleDependenciesControl[0]; @@ -55,7 +56,7 @@ } private Composite getFacetErrorComposite(final Composite parent) { - final String errorCheckingFacet = "Error Checking Project Facets"; + final String errorCheckingFacet = Messages.J2EEDependenciesPage_ErrorCheckingFacets; setErrorMessage(errorCheckingFacet); setValid(false); return getErrorComposite(parent, errorCheckingFacet); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -85,7 +85,7 @@ protected void createPushButtons() { super.createPushButtons(); if (isVersion5) - changeLibPathButton = createPushButton(J2EEUIMessages.getResourceString(J2EEUIMessages.CHANGE_LIB_DIR));//$NON-NLS-1$ + changeLibPathButton = createPushButton(J2EEUIMessages.getResourceString(J2EEUIMessages.CHANGE_LIB_DIR)); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/impl/EarModuleDependencyPageProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/impl/EarModuleDependencyPageProvider.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/impl/EarModuleDependencyPageProvider.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -10,7 +10,7 @@ public class EarModuleDependencyPageProvider implements IDependencyPageProvider { public boolean canHandle(IFacetedProject project) { - boolean isEAR = project.hasProjectFacet(ProjectFacetsManager.getProjectFacet("jst.ear")); + boolean isEAR = project.hasProjectFacet(ProjectFacetsManager.getProjectFacet("jst.ear")); //$NON-NLS-1$ return isEAR; } Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.settings/org.eclipse.jdt.core.prefs 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.settings/org.eclipse.jdt.core.prefs 2009-07-01 05:00:51 UTC (rev 16306) @@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning org.eclipse.jdt.core.compiler.source=1.5 Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Activator.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Activator.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Activator.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -21,7 +21,7 @@ public class Activator extends AbstractUIPlugin { - public static final String PLUGIN_ID = "org.jboss.tools.process.ruleflow"; + public static final String PLUGIN_ID = "org.jboss.tools.process.ruleflow"; //$NON-NLS-1$ private static Activator plugin; Added: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Messages.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Messages.java (rev 0) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Messages.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -0,0 +1,20 @@ +package org.jboss.tools.process.ruleflow; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.process.ruleflow.messages"; //$NON-NLS-1$ + public static String RuleFlowPaletteFactory_ConnectionDesc; + public static String RuleFlowPaletteFactory_ConnectionLabel; + public static String RuleFlowPaletteFactory_StartDesc; + public static String RuleFlowPaletteFactory_StartLabel; + public static String RuleFlowPaletteFactory_SubProcessDesc; + public static String RuleFlowPaletteFactory_SubProcessLabel; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowEditor.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowEditor.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowEditor.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -43,7 +43,7 @@ } protected Object createModel() { - return ElementRegistry.createWrapper("org.jboss.tools.flow.ruleflow.process"); + return ElementRegistry.createWrapper("org.jboss.tools.flow.ruleflow.process"); //$NON-NLS-1$ } protected void writeModel(OutputStream os) throws IOException { Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -28,6 +28,7 @@ import org.jboss.tools.flow.common.editor.PaletteFactory; import org.jboss.tools.flow.common.registry.ElementRegistry; import org.jboss.tools.process.ruleflow.Activator; +import org.jboss.tools.process.ruleflow.Messages; /** * Factory for creating a RuleFlow palette. @@ -44,11 +45,11 @@ protected PaletteEntry createConnectionEntry() { return new ConnectionCreationToolEntry( - "Connection", - "Creating a new connection", - ElementRegistry.getCreationFactory("org.jboss.tools.flow.ruleflow.connection"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/connection.gif")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/connection.gif")) + Messages.RuleFlowPaletteFactory_ConnectionLabel, + Messages.RuleFlowPaletteFactory_ConnectionDesc, + ElementRegistry.getCreationFactory("org.jboss.tools.flow.ruleflow.connection"), //$NON-NLS-1$ + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/connection.gif")), //$NON-NLS-1$ + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/connection.gif")) //$NON-NLS-1$ ); } @@ -56,22 +57,22 @@ List<PaletteEntry> entries = new ArrayList<PaletteEntry>(); CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry( - "Start", - "Create a new start node", - "org.jboss.tools.flow.ruleflow.start", - ElementRegistry.getCreationFactory("org.jboss.tools.flow.ruleflow.start"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/start.gif")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/start.gif")) + Messages.RuleFlowPaletteFactory_StartLabel, + Messages.RuleFlowPaletteFactory_StartDesc, + "org.jboss.tools.flow.ruleflow.start", //$NON-NLS-1$ + ElementRegistry.getCreationFactory("org.jboss.tools.flow.ruleflow.start"), //$NON-NLS-1$ + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/start.gif")), //$NON-NLS-1$ + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/start.gif")) //$NON-NLS-1$ ); entries.add(combined); combined = new CombinedTemplateCreationEntry( - "SubProcess", - "Create a new sub process node", - "org.jboss.tools.flow.ruleflow.subProcess", - ElementRegistry.getCreationFactory("org.jboss.tools.flow.ruleflow.subProcess"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/process.gif")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/process.gif")) + Messages.RuleFlowPaletteFactory_SubProcessLabel, + Messages.RuleFlowPaletteFactory_SubProcessDesc, + "org.jboss.tools.flow.ruleflow.subProcess", //$NON-NLS-1$ + ElementRegistry.getCreationFactory("org.jboss.tools.flow.ruleflow.subProcess"), //$NON-NLS-1$ + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/process.gif")), //$NON-NLS-1$ + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/process.gif")) //$NON-NLS-1$ ); entries.add(combined); Added: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/messages.properties =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/messages.properties (rev 0) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/messages.properties 2009-07-01 05:00:51 UTC (rev 16306) @@ -0,0 +1,6 @@ +RuleFlowPaletteFactory_ConnectionDesc=Creating a new connection +RuleFlowPaletteFactory_ConnectionLabel=Connection +RuleFlowPaletteFactory_StartDesc=Create a new start node +RuleFlowPaletteFactory_StartLabel=Start +RuleFlowPaletteFactory_SubProcessDesc=Create a new sub process node +RuleFlowPaletteFactory_SubProcessLabel=SubProcess Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/ConnectionImpl.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/ConnectionImpl.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/ConnectionImpl.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -29,8 +29,8 @@ public ConnectionImpl(org.drools.workflow.core.Connection connection, Node from, Node to) { this.connection = (org.drools.workflow.core.impl.ConnectionImpl) connection; // TODO XML should contain this meta-data - setMetaData("configurationElement", - ElementRegistry.getConfigurationElement("org.jboss.tools.flow.ruleflow.connection")); + setMetaData("configurationElement", //$NON-NLS-1$ + ElementRegistry.getConfigurationElement("org.jboss.tools.flow.ruleflow.connection")); //$NON-NLS-1$ this.from = from; this.to = to; } Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/RuleFlowProcess.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/RuleFlowProcess.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/RuleFlowProcess.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -24,8 +24,8 @@ public RuleFlowProcess(org.drools.ruleflow.core.RuleFlowProcess process) { this.process = process; // TODO XML should contain this meta-data - setMetaData("configurationElement", - ElementRegistry.getConfigurationElement("org.jboss.tools.flow.ruleflow.process")); + setMetaData("configurationElement", //$NON-NLS-1$ + ElementRegistry.getConfigurationElement("org.jboss.tools.flow.ruleflow.process")); //$NON-NLS-1$ List<org.drools.workflow.core.Connection> connections = new ArrayList<org.drools.workflow.core.Connection>(); for (org.drools.workflow.core.Node node: process.getNodes()) { Node newNode = null; @@ -35,7 +35,7 @@ newNode = new SubProcessNode((org.drools.workflow.core.node.SubProcessNode) node); } if (newNode == null) { - throw new IllegalArgumentException("Could not find NodeImpl for node " + newNode); + throw new IllegalArgumentException("Could not find NodeImpl for node " + newNode); //$NON-NLS-1$ } this.nodes.put(node.getId(), newNode); for (List<org.drools.workflow.core.Connection> inConnections: node.getIncomingConnections().values()) { Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/StartNode.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/StartNode.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/StartNode.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -12,8 +12,8 @@ public StartNode(org.drools.workflow.core.node.StartNode node) { super(node); // TODO XML should contain this meta-data - setMetaData("configurationElement", - ElementRegistry.getConfigurationElement("org.jboss.tools.flow.ruleflow.start")); + setMetaData("configurationElement", //$NON-NLS-1$ + ElementRegistry.getConfigurationElement("org.jboss.tools.flow.ruleflow.start")); //$NON-NLS-1$ } } Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/SubProcessNode.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/SubProcessNode.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/SubProcessNode.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -12,8 +12,8 @@ public SubProcessNode(org.drools.workflow.core.node.SubProcessNode node) { super(node); // TODO XML should contain this meta-data - setMetaData("configurationElement", - ElementRegistry.getConfigurationElement("org.jboss.tools.flow.ruleflow.subProcess")); + setMetaData("configurationElement", //$NON-NLS-1$ + ElementRegistry.getConfigurationElement("org.jboss.tools.flow.ruleflow.subProcess")); //$NON-NLS-1$ } } Added: trunk/examples/plugins/org.jboss.tools.project.examples/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/examples/plugins/org.jboss.tools.project.examples/.settings/org.eclipse.jdt.core.prefs 2009-07-01 05:00:51 UTC (rev 16306) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -258,7 +258,7 @@ } project.setCategory(category); } - if (nodeName.equals(NAME)) { //$NON-NLS-1$ + if (nodeName.equals(NAME)) { project.setName(getContent(child)); } if (nodeName.equals("site")) { //$NON-NLS-1$ @@ -271,7 +271,7 @@ if (nodeName.equals("description")) { //$NON-NLS-1$ project.setDescription(getContent(child)); } - if (nodeName.equals(URL)) { //$NON-NLS-1$ + if (nodeName.equals(URL)) { project.setUrl(getContent(child)); } if (nodeName.equals("size")) { //$NON-NLS-1$ @@ -306,7 +306,7 @@ } else { project.setType(EDITOR); } - attribute = child.getAttribute(URL); //$NON-NLS-1$ + attribute = child.getAttribute(URL); if (attribute == null || attribute.trim().length() <= 0) { project.setWelcome(false); ProjectExamplesActivator.log(Messages.ProjectUtil_Invalid_welcome_element); @@ -406,7 +406,7 @@ return ""; //$NON-NLS-1$ } Document doc = getDocument(); - Element sitesElement = doc.createElement(SITES); //$NON-NLS-1$ + Element sitesElement = doc.createElement(SITES); doc.appendChild(sitesElement); for (ProjectExampleSite site : sites) { Element siteElement = doc.createElement(SITE); Modified: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/.settings/org.eclipse.jdt.core.prefs 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/.settings/org.eclipse.jdt.core.prefs 2009-07-01 05:00:51 UTC (rev 16306) @@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning org.eclipse.jdt.core.compiler.source=1.5 Modified: trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/src/org/jboss/tools/labs/pde/sourceprovider/EclipseSourceContainerType.java =================================================================== --- trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/src/org/jboss/tools/labs/pde/sourceprovider/EclipseSourceContainerType.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/src/org/jboss/tools/labs/pde/sourceprovider/EclipseSourceContainerType.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -1,6 +1,7 @@ package org.jboss.tools.labs.pde.sourceprovider; import java.io.File; +import java.text.MessageFormat; import java.util.HashMap; import java.util.Iterator; @@ -31,13 +32,13 @@ if ("eclipseHome".equals(element.getNodeName())) { //$NON-NLS-1$ String string = element.getAttribute("path"); //$NON-NLS-1$ if (string == null || string.length() == 0) { - abort("Eclipse Home Not Found", null); + abort(Messages.EclipseSourceContainerType_EclipseHomeNotFonud, null); } return new EclipseSourceContainer(new File(string)); } - abort("Error unserializing memento", null); + abort(Messages.EclipseSourceContainerType_ErrorUnserializing, null); } - abort("Error unserializing memento", null); + abort(Messages.EclipseSourceContainerType_ErrorUnserializing, null); return null; } @@ -87,7 +88,7 @@ } public String getName() { - return "Eclipse Installation " + root.getAbsolutePath().toString(); + return MessageFormat.format(Messages.EclipseSourceContainerType_EclipseInstallationName, root.getAbsolutePath().toString()); } public ISourceContainerType getType() { Added: trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/src/org/jboss/tools/labs/pde/sourceprovider/Messages.java =================================================================== --- trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/src/org/jboss/tools/labs/pde/sourceprovider/Messages.java (rev 0) +++ trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/src/org/jboss/tools/labs/pde/sourceprovider/Messages.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -0,0 +1,17 @@ +package org.jboss.tools.labs.pde.sourceprovider; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.labs.pde.sourceprovider.messages"; //$NON-NLS-1$ + public static String EclipseSourceContainerType_EclipseHomeNotFonud; + public static String EclipseSourceContainerType_EclipseInstallationName; + public static String EclipseSourceContainerType_ErrorUnserializing; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Added: trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/src/org/jboss/tools/labs/pde/sourceprovider/messages.properties =================================================================== --- trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/src/org/jboss/tools/labs/pde/sourceprovider/messages.properties (rev 0) +++ trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/src/org/jboss/tools/labs/pde/sourceprovider/messages.properties 2009-07-01 05:00:51 UTC (rev 16306) @@ -0,0 +1,3 @@ +EclipseSourceContainerType_EclipseHomeNotFonud=Eclipse Home Not Found +EclipseSourceContainerType_EclipseInstallationName=Eclipse Installation {0} +EclipseSourceContainerType_ErrorUnserializing=Error unserializing memento Added: trunk/portlet/plugins/org.jboss.tools.portlet.core/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/.settings/org.eclipse.jdt.core.prefs 2009-07-01 05:00:51 UTC (rev 16306) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Added: trunk/portlet/plugins/org.jboss.tools.portlet.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/.settings/org.eclipse.jdt.core.prefs 2009-07-01 05:00:51 UTC (rev 16306) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -162,7 +162,7 @@ private void addProjectNameGroup(Composite parent) { // set up project name label projectNameLabel = new Label(parent, SWT.NONE); - projectNameLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_PROJECT)); //$NON-NLS-1$ + projectNameLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_PROJECT)); GridData data = new GridData(); projectNameLabel.setLayoutData(data); // set up project name entry field Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/xpl/NewJavaClassWizardPageEx.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/xpl/NewJavaClassWizardPageEx.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/xpl/NewJavaClassWizardPageEx.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -161,7 +161,7 @@ private void addProjectNameGroup(Composite parent) { // set up project name label projectNameLabel = new Label(parent, SWT.NONE); - projectNameLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_PROJECT)); //$NON-NLS-1$ + projectNameLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_PROJECT)); GridData data = new GridData(); projectNameLabel.setLayoutData(data); // set up project name entry field Added: trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/.settings/org.eclipse.jdt.core.prefs 2009-07-01 05:00:51 UTC (rev 16306) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Modified: trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/src/org/jboss/tools/eclipse/as/tptp/PICollectorFiltration.java =================================================================== --- trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/src/org/jboss/tools/eclipse/as/tptp/PICollectorFiltration.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/src/org/jboss/tools/eclipse/as/tptp/PICollectorFiltration.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -29,7 +29,7 @@ boolean isInclude; JVMVersionDetector jvmVersionDetector = new JVMVersionDetector(configuration); String version = jvmVersionDetector.retrieveVersionOutput(); - isInclude = version.indexOf("1.3") >0 || version.indexOf("1.4") >0 || version.indexOf("1.5") >0; + isInclude = version.indexOf("1.3") >0 || version.indexOf("1.4") >0 || version.indexOf("1.5") >0; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ return isInclude; } } Added: trunk/ws/plugins/org.jboss.tools.ws.core/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.core/.settings/org.eclipse.jdt.core.prefs 2009-07-01 05:00:51 UTC (rev 16306) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JBossWSCorePlugin.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JBossWSCorePlugin.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JBossWSCorePlugin.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -21,7 +21,7 @@ public class JBossWSCorePlugin extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.ws.core"; + public static final String PLUGIN_ID = "org.jboss.tools.ws.core"; //$NON-NLS-1$ // The shared instance private static JBossWSCorePlugin plugin; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/.settings/org.eclipse.jdt.core.prefs 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/.settings/org.eclipse.jdt.core.prefs 2009-07-01 05:00:51 UTC (rev 16306) @@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning org.eclipse.jdt.core.compiler.source=1.5 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/JBossWSCreationCore.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/JBossWSCreationCore.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/JBossWSCreationCore.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -9,7 +9,7 @@ public class JBossWSCreationCore extends BaseUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.ws.creation.core"; + public static final String PLUGIN_ID = "org.jboss.tools.ws.creation.core"; //$NON-NLS-1$ // The shared instance private static JBossWSCreationCore plugin; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -52,18 +52,18 @@ try { String runtimeLocation = JBossWSCreationUtils .getJBossWSRuntimeLocation(project); - String commandLocation = runtimeLocation + Path.SEPARATOR + "bin"; + String commandLocation = runtimeLocation + Path.SEPARATOR + "bin"; //$NON-NLS-1$ IPath path = new Path(commandLocation); List<String> command = new ArrayList<String>(); - if (System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) { - command.add("cmd.exe"); - command.add("/c"); + if (System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) { //$NON-NLS-1$ //$NON-NLS-2$ + command.add("cmd.exe"); //$NON-NLS-1$ + command.add("/c"); //$NON-NLS-1$ command.add(cmdFileName_win); path = path.append(cmdFileName_win); } else { - command.add("sh"); + command.add("sh"); //$NON-NLS-1$ command.add(cmdFileName_linux); path = path.append(cmdFileName_linux); } @@ -93,7 +93,7 @@ return StatusUtils.errorStatus(errorResult.toString()); } else { String resultInput = inputResult.toString(); - if (resultInput != null && resultInput.indexOf("[ERROR]") >= 0) { + if (resultInput != null && resultInput.indexOf("[ERROR]") >= 0) { //$NON-NLS-1$ JBossWSCreationCore.getDefault().logError(resultInput); IStatus errorStatus = StatusUtils .warningStatus(resultInput); @@ -128,12 +128,12 @@ model.getWebProjectName()).toOSString(); IJavaProject javaProject = JavaCore.create(project); - command.add("-k"); + command.add("-k"); //$NON-NLS-1$ - command.add("-s"); + command.add("-s"); //$NON-NLS-1$ command.add(JBossWSCreationUtils.getJavaProjectSrcLocation(project)); - command.add("-o"); + command.add("-o"); //$NON-NLS-1$ StringBuffer opDir = new StringBuffer(); opDir.append(projectRoot).append(Path.SEPARATOR).append( javaProject.getOutputLocation().removeFirstSegments(1) @@ -157,7 +157,7 @@ String str; str = reader.readLine(); while (str != null) { - result.append(str).append("\t\r"); + result.append(str).append("\t\r"); //$NON-NLS-1$ str = reader.readLine(); } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -47,10 +47,10 @@ public class ClientSampleCreationCommand extends AbstractDataModelOperation { public static final String LINE_SEPARATOR = System - .getProperty("line.separator"); - private static final String PACAKAGE = ".*"; - private static final String PACAKAGESPLIT = "\\."; - private static final String SRC = "src"; + .getProperty("line.separator"); //$NON-NLS-1$ + private static final String PACAKAGE = ".*"; //$NON-NLS-1$ + private static final String PACAKAGESPLIT = "\\."; //$NON-NLS-1$ + private static final String SRC = "src"; //$NON-NLS-1$ private ServiceModel model; @@ -108,16 +108,16 @@ StringBuffer sb = new StringBuffer(); sb.append("public static void main(String[] args) {"); sb.append(LINE_SEPARATOR); - sb.append(" System.out.println(\"***********************\");"); + sb.append(" System.out.println(\"***********************\");"); //$NON-NLS-1$ sb.append(LINE_SEPARATOR); createWebServiceClient(clientUnits, serviceUnits, sb); - sb.append(" System.out.println(\"***********************\");"); + sb.append(" System.out.println(\"***********************\");"); //$NON-NLS-1$ sb.append(LINE_SEPARATOR); - sb.append(" System.out.println(\"").append( + sb.append(" System.out.println(\"").append( //$NON-NLS-1$ JBossWSCreationCoreMessages.Client_Sample_Run_Over).append( - "\");"); + "\");"); //$NON-NLS-1$ sb.append(LINE_SEPARATOR); - sb.append("}"); + sb.append("}"); //$NON-NLS-1$ try { clientClsType.createMethod(sb.toString(), null, true, null); clientCls.save(null, true); @@ -143,13 +143,13 @@ private void createWebService(List<ICompilationUnit> serviceUnits, MethodDeclaration method, StringBuffer sb, int i) { sb - .append(" System.out.println(\"" + .append(" System.out.println(\"" //$NON-NLS-1$ + "Create Web Service...\");"); sb.append(LINE_SEPARATOR); sb.append(" " + method.getReturnType2().toString()); sb.append(" port").append(i).append(" = "); sb.append("service").append(i).append("."); - sb.append(method.getName()).append("();"); + sb.append(method.getName()).append("();"); //$NON-NLS-1$ sb.append(LINE_SEPARATOR); for (ICompilationUnit unit : serviceUnits) { @@ -177,7 +177,7 @@ */ private void callWebServiceOperation(TypeDeclaration typeDec, StringBuffer sb, int i) { - sb.append(" System.out.println(\"" + sb.append(" System.out.println(\"" //$NON-NLS-1$ + "Call Web Service Operation...\");"); sb.append(LINE_SEPARATOR); @@ -185,7 +185,7 @@ // call web serivce Operation for (MethodDeclaration method : methodDec) { - if (method.getReturnType2().toString().equals("void")) { + if (method.getReturnType2().toString().equals("void")) { //$NON-NLS-1$ sb.append(" System.out.println(\"Server said: "); sb.append("port").append(i).append("."); sb.append(method.getName()).append("() is a void method!\");"); @@ -193,15 +193,15 @@ } else { sb.append(" System.out.println(\"Server said: \" + "); sb.append("port").append(i).append("."); - sb.append(method.getName()).append("("); + sb.append(method.getName()).append("("); //$NON-NLS-1$ for (int j = 0; j < method.parameters().size(); j++) { sb.append("args[").append(j).append("]"); if (j != method.parameters().size() - 1) { - sb.append(","); + sb.append(","); //$NON-NLS-1$ } } - sb.append("));"); + sb.append("));"); //$NON-NLS-1$ sb.append(LINE_SEPARATOR); } } @@ -218,7 +218,7 @@ private void createWebServiceClient(List<ICompilationUnit> clientUnits, List<ICompilationUnit> serviceUnits, StringBuffer sb) { int i = 1; - sb.append(" System.out.println(\"" + sb.append(" System.out.println(\"" //$NON-NLS-1$ + "Create Web Service Client...\");"); sb.append(LINE_SEPARATOR); for (ICompilationUnit unit : clientUnits) { @@ -231,10 +231,10 @@ List types = result.types(); TypeDeclaration typeDec = (TypeDeclaration) types.get(0); - sb.append(" " + typeDec.getName()); + sb.append(" " + typeDec.getName()); //$NON-NLS-1$ sb.append(" service").append(i).append(" = new "); sb.append(typeDec.getName()); - sb.append("();"); + sb.append("();"); //$NON-NLS-1$ sb.append(LINE_SEPARATOR); MethodDeclaration methodDec[] = typeDec.getMethods(); @@ -315,28 +315,28 @@ IPackageFragmentRoot root = javaProject .findPackageFragmentRoot(srcPath); if (packageName == null) { - packageName = ""; + packageName = ""; //$NON-NLS-1$ } IPackageFragment pkg = root.createPackageFragment(packageName, false, null); ICompilationUnit wrapperCls = pkg.createCompilationUnit(className - + ".java", "", true, null); - if (!packageName.equals("")) { + + ".java", "", true, null); //$NON-NLS-1$//$NON-NLS-2$ + if (!packageName.equals("")) { //$NON-NLS-1$ wrapperCls.createPackageDeclaration(packageName, null); } - String clsContent = ""; + String clsContent = ""; //$NON-NLS-1$ if (isInterface) { - clsContent = "public interface " + className + " {" + clsContent = "public interface " + className + " {" //$NON-NLS-1$ //$NON-NLS-2$ + LINE_SEPARATOR; - clsContent += "}" + LINE_SEPARATOR; + clsContent += "}" + LINE_SEPARATOR; //$NON-NLS-1$ } else { - clsContent = "public class " + className; + clsContent = "public class " + className; //$NON-NLS-1$ if (interfaceName != null) { - clsContent += " implements " + interfaceName; + clsContent += " implements " + interfaceName; //$NON-NLS-1$ } - clsContent += " {" + LINE_SEPARATOR; - clsContent += "}" + LINE_SEPARATOR; + clsContent += " {" + LINE_SEPARATOR; //$NON-NLS-1$ + clsContent += "}" + LINE_SEPARATOR; //$NON-NLS-1$ } wrapperCls.createType(clsContent, null, true, null); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -60,16 +60,16 @@ public class ImplementationClassCreationCommand extends AbstractDataModelOperation { - private static final String RESOURCE_FOLDER = "src"; + private static final String RESOURCE_FOLDER = "src"; //$NON-NLS-1$ - private static final String PREFIX_JAXWS_ANNOTATION_CLASS = "javax.jws"; - private static final String DEFAULT_CU_SUFFIX = ".java"; + private static final String PREFIX_JAXWS_ANNOTATION_CLASS = "javax.jws"; //$NON-NLS-1$ + private static final String DEFAULT_CU_SUFFIX = ".java"; //$NON-NLS-1$ - private static final String ANNOTATION_WEB_SERVICE_FULLNAME = "javax.jws.WebService"; - private static final String ANNOTATION_TYPE_NAME_WEBSERVICE = "WebService";; - private static final String ANNOTATION_PROPERTY_NAME = "name"; - private static final String ANNOTATION_PROPERTY_SERVICE_NAME = "serviceName"; - private static final String ANNOTATION_PROPERTY_ENDPOINT_INTERFACE = "endpointInterface"; + private static final String ANNOTATION_WEB_SERVICE_FULLNAME = "javax.jws.WebService"; //$NON-NLS-1$ + private static final String ANNOTATION_TYPE_NAME_WEBSERVICE = "WebService";; //$NON-NLS-1$ + private static final String ANNOTATION_PROPERTY_NAME = "name"; //$NON-NLS-1$ + private static final String ANNOTATION_PROPERTY_SERVICE_NAME = "serviceName"; //$NON-NLS-1$ + private static final String ANNOTATION_PROPERTY_ENDPOINT_INTERFACE = "endpointInterface"; //$NON-NLS-1$ private ServiceModel model; @@ -96,7 +96,7 @@ List<String> portTypes = model.getPortTypes(); for (String portTypeName : portTypes) { generateImplClass(portTypeName); - String implClsName = getImplPackageName() + "." + String implClsName = getImplPackageName() + "." //$NON-NLS-1$ + getImplClassName(portTypeName); model.addServiceClasses(implClsName); } @@ -225,7 +225,7 @@ String firstLetter = portTypeName.substring(0, 1); String implClsName = firstLetter.toUpperCase() + portTypeName.substring(1); - implClsName = implClsName + "Impl"; + implClsName = implClsName + "Impl"; //$NON-NLS-1$ return implClsName; } @@ -243,7 +243,7 @@ } private String getPortTypeInterfaceFullName(String portTypeName) { - return model.getCustomPackage() + "." + portTypeName; + return model.getCustomPackage() + "." + portTypeName; //$NON-NLS-1$ } private void addImportsToImplementationClass(CompilationUnit implCU, @@ -354,17 +354,17 @@ // do nothing }else { NumberLiteral nl = ast.newNumberLiteral(); - nl.setToken("0"); + nl.setToken("0"); //$NON-NLS-1$ rs.setExpression(nl); } } else if (returnType.isSimpleType()) { String typeName = ((SimpleType) returnType).getName() .getFullyQualifiedName(); - if ("String".equals(typeName)) { + if ("String".equals(typeName)) { //$NON-NLS-1$ StringLiteral sl = ast.newStringLiteral(); - sl.setLiteralValue(""); + sl.setLiteralValue(""); //$NON-NLS-1$ rs.setExpression(sl); } else{ rs.setExpression(ast.newNullLiteral()); @@ -456,7 +456,7 @@ IProject project = JBossWSCreationUtils.getProjectByName(model .getWebProjectName()); IFolder srcFolder = project.getFolder(RESOURCE_FOLDER); - String pkgFolderName = model.getCustomPackage().replace(".", + String pkgFolderName = model.getCustomPackage().replace(".", //$NON-NLS-1$ File.separator); return srcFolder.getFolder(pkgFolderName); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -57,7 +57,7 @@ String location = JBossWSCreationUtils .getJBossWSRuntimeLocation(JBossWSCreationUtils .getProjectByName(model.getWebProjectName())); - if (location.equals("")) { + if (location.equals("")) { //$NON-NLS-1$ return StatusUtils .errorStatus(JBossWSCreationCoreMessages.Error_WS_Location); } else if (!new Path(location).append(JBossWSUIMessages.Bin) Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -41,7 +41,7 @@ try { String location = JBossWSCreationUtils.getJBossWSRuntimeLocation(JBossWSCreationUtils.getProjectByName(model.getWebProjectName())); - if (location.equals("")) { + if (location.equals("")) { //$NON-NLS-1$ return StatusUtils .errorStatus(JBossWSCreationCoreMessages.Error_WS_Location); } else if(!new Path(location).append(JBossWSUIMessages.Bin).append(JBossWSUIMessages.Command).toFile().exists()){ Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/Java2WSCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/Java2WSCommand.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/Java2WSCommand.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -30,8 +30,8 @@ */ public class Java2WSCommand extends AbstractGenerateCodeCommand { - private static String WSPROVIDER_FILE_NAME_LINUX = "wsprovide.sh"; - private static String WSPROVIDER_FILE_NAME_WIN = "wsprovide.bat"; + private static String WSPROVIDER_FILE_NAME_LINUX = "wsprovide.sh"; //$NON-NLS-1$ + private static String WSPROVIDER_FILE_NAME_WIN = "wsprovide.bat"; //$NON-NLS-1$ public Java2WSCommand(ServiceModel model) { super(model); @@ -58,13 +58,13 @@ .getProject(projectName); if (model.isGenWSDL()) { - command.add("-w"); + command.add("-w"); //$NON-NLS-1$ } - command.add("-r"); - command.add(projectRoot + Path.SEPARATOR + "wsdl"); + command.add("-r"); //$NON-NLS-1$ + command.add(projectRoot + Path.SEPARATOR + "wsdl"); //$NON-NLS-1$ command.add(model.getServiceClasses().get(0)); - command.add("-c"); + command.add("-c"); //$NON-NLS-1$ command.add(getClasspath(iProject)); } @@ -74,34 +74,34 @@ if (isLongCommandLines(cpStr)) { File tempJar = null; - tempJar = File.createTempFile("temp", ".jar"); + tempJar = File.createTempFile("temp", ".jar"); //$NON-NLS-1$ //$NON-NLS-2$ Manifest mf = new Manifest(); // replace space with "%20" - cpStr = cpStr.replace(" ", "%20"); + cpStr = cpStr.replace(" ", "%20"); //$NON-NLS-1$ //$NON-NLS-2$ // replace \ with / - cpStr = cpStr.replace("\\", "/"); + cpStr = cpStr.replace("\\", "/"); //$NON-NLS-1$ //$NON-NLS-2$ // get classpath array - String[] cpArray = cpStr.split(";"); + String[] cpArray = cpStr.split(";"); //$NON-NLS-1$ StringBuffer cpBF = new StringBuffer(); for (int i = 0; i < cpArray.length; i++) { // if the classpath entry is a directory, it should be added a / // after it - if (!cpArray[i].endsWith(".jar") && !cpArray[i].endsWith("/")) { - cpArray[i] = cpArray[i] + "/"; + if (!cpArray[i].endsWith(".jar") && !cpArray[i].endsWith("/")) { //$NON-NLS-1$ //$NON-NLS-2$ + cpArray[i] = cpArray[i] + "/"; //$NON-NLS-1$ } // if the system is windows, the classpath entry should be added // a / before it - if (System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) - cpArray[i] = "/" + cpArray[i]; + if (System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) //$NON-NLS-1$ //$NON-NLS-2$ + cpArray[i] = "/" + cpArray[i]; //$NON-NLS-1$ // there should be a space between classpath entries - cpBF.append(cpArray[i]).append(" "); + cpBF.append(cpArray[i]).append(" "); //$NON-NLS-1$ } cpStr = cpBF.toString(); cpStr.trim(); mf.getMainAttributes().put(Attributes.Name.CLASS_PATH, cpStr); - mf.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.2"); + mf.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.2"); //$NON-NLS-1$ try { FileUtil.jar(new File[0], tempJar.getAbsolutePath(), mf); @@ -112,8 +112,8 @@ cpStr = tempJar.getAbsolutePath(); } else { // if the system is not windows, the split should be : - if (System.getProperty("os.name").toLowerCase().indexOf("win") < 0) - cpStr = cpStr.replace(";", ":"); + if (System.getProperty("os.name").toLowerCase().indexOf("win") < 0) //$NON-NLS-1$ //$NON-NLS-2$ + cpStr = cpStr.replace(";", ":"); //$NON-NLS-1$ //$NON-NLS-2$ } return cpStr; } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -136,7 +136,7 @@ private ServletDescriptor getServletDescriptor(String clsName) { String servletName = JBossWSCreationUtils.classNameFromQualifiedName(clsName); - if(servletName.endsWith("Impl") && servletName.length() > 4){ + if(servletName.endsWith("Impl") && servletName.length() > 4){ //$NON-NLS-1$ servletName = servletName.substring(0, servletName.length() - 4); } ServletDescriptor sd = new ServletDescriptor(); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -71,8 +71,8 @@ for(IClasspathEntry entry:entries){ IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), project); if(container instanceof JBossWSRuntimeClasspathContainer){ - ((JBossWSRuntimeClasspathContainer)container).removeEntry("jaxws-rt.jar"); - ((JBossWSRuntimeClasspathContainer)container).removeEntry("jaxws-tools.jar"); + ((JBossWSRuntimeClasspathContainer)container).removeEntry("jaxws-rt.jar"); //$NON-NLS-1$ + ((JBossWSRuntimeClasspathContainer)container).removeEntry("jaxws-tools.jar"); //$NON-NLS-1$ } } } catch (JavaModelException e) { Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -7,8 +7,8 @@ public class WSDL2JavaCommand extends AbstractGenerateCodeCommand{ - private static String WSCONSUEM_FILE_NAME_LINUX = "wsconsume.sh"; - private static String WSCONSUEM_FILE_NAME_WIN = "wsconsume.bat"; + private static String WSCONSUEM_FILE_NAME_LINUX = "wsconsume.sh"; //$NON-NLS-1$ + private static String WSCONSUEM_FILE_NAME_WIN = "wsconsume.bat"; //$NON-NLS-1$ public WSDL2JavaCommand(ServiceModel model){ super(model); @@ -28,8 +28,8 @@ @Override protected void addCommandlineArgs(List<String> command) { - if(model.getCustomPackage() != null && !"".equals(model.getCustomPackage())){ - command.add("-p"); + if(model.getCustomPackage() != null && !"".equals(model.getCustomPackage())){ //$NON-NLS-1$ + command.add("-p"); //$NON-NLS-1$ command.add(model.getCustomPackage()); } @@ -37,21 +37,21 @@ for(String bindingFileLocation: bindingFiles){ File bindingFile = new File(bindingFileLocation); if(bindingFile.exists()){ - command.add("-b"); + command.add("-b"); //$NON-NLS-1$ command.add(bindingFileLocation); } } - if(model.getCatalog() != null && !"".equals(model.getCatalog().trim())){ + if(model.getCatalog() != null && !"".equals(model.getCatalog().trim())){ //$NON-NLS-1$ File catalog = new File(model.getCatalog()); if(catalog.exists()){ - command.add("-c"); + command.add("-c"); //$NON-NLS-1$ command.add(model.getCatalog()); } } if(model.getTarget() != null){ - command.add("-t"); + command.add("-t"); //$NON-NLS-1$ command.add(model.getTarget()); } } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2009-07-01 05:00:51 UTC (rev 16306) @@ -43,4 +43,5 @@ JBossWSFacetInstallPage_ServerSuppliedJBossWS=Server Supplied JBossWS Runtime JBossWSFacetInstallPage_Deploy= Package all JBossWS runtime jars into the deployment archive JBossWSFacetInstallPage_New=New... +JBossWSRuntimeConfigBlock_Duplicated_Jar=Duplicated jar on classpath:{0} Client_Sample_Run_Over= Call Over! Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -15,6 +15,8 @@ public static String JBossWSFacetInstallPage_Title; + public static String JBossWSRuntimeConfigBlock_Duplicated_Jar; + public static String Label_Custom_Package_Name; public static String Label_Catalog_File; public static String Label_Button_Text_Seletion; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/ClasspathParser.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/ClasspathParser.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/ClasspathParser.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -47,7 +47,7 @@ if (!classpathVector.contains(classpathEntries[i])) { classpathVector.add(classpathEntries[i]); classpath.append(classpathEntries[i]); - classpath.append(";"); + classpath.append(";"); //$NON-NLS-1$ } } return classpath.toString(); @@ -178,7 +178,7 @@ if (dir.exists() && dir.isDirectory()) { String[] filenames = dir.list(); for (int i = 0; i < filenames.length; i++) { - if (filenames[i].endsWith(".jar")) + if (filenames[i].endsWith(".jar")) //$NON-NLS-1$ jarsVector.add(pathToString(iPath) + filenames[i]); } } @@ -196,13 +196,13 @@ if (component != null) { IVirtualFolder webInfLib = component.getRootFolder().getFolder( - new Path("/WEB-INF/lib")); + new Path("/WEB-INF/lib")); //$NON-NLS-1$ if (webInfLib != null) { IVirtualResource[] resources = webInfLib.members(); IResource aResource = null; for (int i = 0; i < resources.length; i++) { aResource = resources[i].getUnderlyingResource(); - if ("jar".equalsIgnoreCase(aResource.getFileExtension())) + if ("jar".equalsIgnoreCase(aResource.getFileExtension())) //$NON-NLS-1$ anArrayList.add(aResource.getLocation() .toOSString()); } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -58,15 +58,15 @@ public class JBossWSCreationUtils { - static final String javaKeyWords[] = { "abstract", "assert", "boolean", - "break", "byte", "case", "catch", "char", "class", "const", - "continue", "default", "do", "double", "else", "extends", "false", - "final", "finally", "float", "for", "goto", "if", "implements", - "import", "instanceof", "int", "interface", "long", "native", - "new", "null", "package", "private", "protected", "public", - "return", "short", "static", "strictfp", "super", "switch", - "synchronized", "this", "throw", "throws", "transient", "true", - "try", "void", "volatile", "while" }; + static final String javaKeyWords[] = { "abstract", "assert", "boolean", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + "break", "byte", "case", "catch", "char", "class", "const", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ + "continue", "default", "do", "double", "else", "extends", "false", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ + "final", "finally", "float", "for", "goto", "if", "implements", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ + "import", "instanceof", "int", "interface", "long", "native", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ + "new", "null", "package", "private", "protected", "public", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ + "return", "short", "static", "strictfp", "super", "switch", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ + "synchronized", "this", "throw", "throws", "transient", "true", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ + "try", "void", "volatile", "while" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ public static boolean isJavaKeyword(String keyword) { if (hasUpperCase(keyword)) { @@ -138,7 +138,7 @@ } private static String replaceEscapecharactors(String vulnarableString) { - if (vulnarableString.indexOf("/") != -1) { + if (vulnarableString.indexOf("/") != -1) { //$NON-NLS-1$ vulnarableString = vulnarableString.replace('/', File.separator .charAt(0)); } @@ -158,7 +158,7 @@ // Windows check (because from inside wtp in return I received a hard // coded path) if (File.separatorChar == '\\') { - return "\\"; + return "\\"; //$NON-NLS-1$ } else { return File.separator; } @@ -168,7 +168,7 @@ // Windows check (because from inside wtp in return I received a hard // coded path) if (File.separatorChar == '\\') { - return "\\" + File.separator; + return "\\" + File.separator; //$NON-NLS-1$ } else { return File.separator; } @@ -177,9 +177,9 @@ public static String classNameFromQualifiedName(String qualifiedCalssName) { // This was done due to not splitting with . Strange qualifiedCalssName = qualifiedCalssName.replace('.', ':'); - String[] parts = qualifiedCalssName.split(":"); + String[] parts = qualifiedCalssName.split(":"); //$NON-NLS-1$ if (parts.length == 0) { - return ""; + return ""; //$NON-NLS-1$ } return parts[parts.length - 1]; } @@ -283,7 +283,7 @@ public static boolean validateJBossWSLocation() { String location = JBossWSCorePlugin.getDefault().getPreferenceStore() .getString(JBossWSCoreMessages.WS_Location); - if (location == null || location.equals("")) { + if (location == null || location.equals("")) { //$NON-NLS-1$ return false; } return true; @@ -298,7 +298,7 @@ .getPersistentProperty(IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME); if (jbwsRuntimeName != null - && !"".equals(jbwsRuntimeName) + && !"".equals(jbwsRuntimeName) //$NON-NLS-1$ && !IJBossWSFacetDataModelProperties.DEFAULT_VALUE_IS_SERVER_SUPPLIED .equals(isServerSupplied)) { JBossWSRuntime jbws = JBossWSRuntimeManager.getInstance() @@ -324,12 +324,12 @@ IRuntime serverRuntime = getRuntime(prjFacetRuntime); String runtimeTypeName = serverRuntime.getRuntimeType().getName(); if (runtimeTypeName == null) { - runtimeTypeName = ""; + runtimeTypeName = ""; //$NON-NLS-1$ } - if (runtimeTypeName.toUpperCase().indexOf("JBOSS") >= 0) { + if (runtimeTypeName.toUpperCase().indexOf("JBOSS") >= 0) { //$NON-NLS-1$ String runtimeLocation = serverRuntime.getLocation() .toOSString(); - if (runtimeLocation.endsWith("bin")) { + if (runtimeLocation.endsWith("bin")) { //$NON-NLS-1$ return serverRuntime.getLocation().removeLastSegments(1) .toOSString(); } else { @@ -353,7 +353,7 @@ } - return ""; + return ""; //$NON-NLS-1$ } @@ -362,7 +362,7 @@ if (runtime == null) throw new IllegalArgumentException(); - String id = runtime.getProperty("id"); + String id = runtime.getProperty("id"); //$NON-NLS-1$ if (id == null) return null; @@ -379,7 +379,7 @@ public static String getJavaProjectSrcLocation(IProject project) throws JavaModelException { IResource[] rs = getJavaSourceRoots(project); - String src = ""; + String src = ""; //$NON-NLS-1$ if (rs == null || rs.length == 0) return src; for (int i = 0; i < rs.length; i++) { Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/WSDLPropertyReader.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/WSDLPropertyReader.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/WSDLPropertyReader.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -71,7 +71,7 @@ private static String getPackageNameFromNamespce(String namespace) { String hostname = null; - String path = ""; + String path = ""; //$NON-NLS-1$ try { java.net.URL url = new java.net.URL(namespace); @@ -79,15 +79,15 @@ hostname = url.getHost(); path = url.getPath(); } catch (MalformedURLException e) { - if (namespace.indexOf(":") > -1) { - hostname = namespace.substring(namespace.indexOf(":") + 1); + if (namespace.indexOf(":") > -1) { //$NON-NLS-1$ + hostname = namespace.substring(namespace.indexOf(":") + 1); //$NON-NLS-1$ - while (hostname.startsWith("/")) { + while (hostname.startsWith("/")) { //$NON-NLS-1$ hostname = hostname.substring(1); } - if (hostname.indexOf("/") > -1) { - hostname = hostname.substring(0, hostname.indexOf("/")); + if (hostname.indexOf("/") > -1) { //$NON-NLS-1$ + hostname = hostname.substring(0, hostname.indexOf("/")); //$NON-NLS-1$ } } else { hostname = namespace.replace('/','.'); @@ -109,7 +109,7 @@ } - StringTokenizer st = new StringTokenizer(hostname, ".:"); + StringTokenizer st = new StringTokenizer(hostname, ".:"); //$NON-NLS-1$ String[] nodes = new String[st.countTokens()]; for (int i = 0; i < nodes.length; ++i) { @@ -122,7 +122,7 @@ appendToPackage(sb, nodes[i], (i == nodes.length - 1)); } - StringTokenizer st2 = new StringTokenizer(path, "/"); + StringTokenizer st2 = new StringTokenizer(path, "/"); //$NON-NLS-1$ while (st2.hasMoreTokens()) { appendToPackage(sb, st2.nextToken(), false); @@ -135,7 +135,7 @@ boolean firstNode) { if (JBossWSCreationUtils.isJavaKeyword(nodeName)) { - nodeName = "_" + nodeName; + nodeName = "_" + nodeName; //$NON-NLS-1$ } if (!firstNode) { Added: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs 2009-07-01 05:00:51 UTC (rev 16306) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/CreationUIPlugin.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/CreationUIPlugin.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/CreationUIPlugin.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -9,7 +9,7 @@ public class CreationUIPlugin extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.jbossws.creation.ui"; + public static final String PLUGIN_ID = "org.jboss.tools.jbossws.creation.ui"; //$NON-NLS-1$ // The shared instance private static CreationUIPlugin plugin; Added: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/Messages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/Messages.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/Messages.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -0,0 +1,18 @@ +package org.jboss.tools.ws.creation.ui; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.ws.creation.ui.messages"; //$NON-NLS-1$ + public static String JBossWSConfigWidgetFactory_Description; + public static String JBossWSConfigWidgetFactory_Title; + public static String JBossWSProviderInvokeConfigWidgetFactory_Description; + public static String JBossWSProviderInvokeConfigWidgetFactory_Title; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Added: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages.properties (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages.properties 2009-07-01 05:00:51 UTC (rev 16306) @@ -0,0 +1,4 @@ +JBossWSConfigWidgetFactory_Description=Please input the appropriate option for the code generation +JBossWSConfigWidgetFactory_Title=JBoss Web Service Code Generation Configuration +JBossWSProviderInvokeConfigWidgetFactory_Description=Please input the appropriate option for the code generation +JBossWSProviderInvokeConfigWidgetFactory_Title=JBoss Web Service Code Generation Configuration Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSRuntimeConfigBlock.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSRuntimeConfigBlock.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSRuntimeConfigBlock.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -1,5 +1,6 @@ package org.jboss.tools.ws.creation.ui.project.facet; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.EventObject; @@ -147,7 +148,7 @@ if(isServerSupplied){ btnServerSupplied.setSelection(true); enableUserSupplied(false); - }else if(runtimeName != null && !runtimeName.equals("")){ + }else if(runtimeName != null && !runtimeName.equals("")){ //$NON-NLS-1$ btnUserSupplied.setSelection(true); if(isDeploy){ btnDeploy.setSelection(true); @@ -159,14 +160,14 @@ } protected void saveJBosswsRuntimeToModel(JBossWSRuntime jbws) { - String duplicateMsg = ""; + String duplicateMsg = ""; //$NON-NLS-1$ try { duplicateMsg = getDuplicateJars(jbws.getName()); } catch (JavaModelException e1) { CreationUIPlugin.getDefault().getLog().log( StatusUtils.errorStatus(e1)); } - if ("".equals(duplicateMsg)) { + if ("".equals(duplicateMsg)) { //$NON-NLS-1$ model.setStringProperty( IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, jbws.getHomeDir()); @@ -292,14 +293,16 @@ && !btnServerSupplied.getSelection()) { setErrorMessage(JBossWSCreationCoreMessages.Error_WS_Chose_runtime); }else if(btnUserSupplied.getSelection()){ - String duplicateMsg = ""; + String duplicateMsg = ""; //$NON-NLS-1$ try { duplicateMsg = getDuplicateJars(cmbRuntimes.getText()); } catch (JavaModelException e1) { CreationUIPlugin.getDefault().getLog().log(StatusUtils.errorStatus(e1)); } - if(!duplicateMsg.equals("")){ - setErrorMessage("Duplicated jar on classpath:" + duplicateMsg); + if(!duplicateMsg.equals("")){ //$NON-NLS-1$ + setErrorMessage(MessageFormat + .format(JBossWSCreationCoreMessages.JBossWSRuntimeConfigBlock_Duplicated_Jar, + duplicateMsg)); }else{ setErrorMessage(null); } @@ -318,7 +321,7 @@ } public boolean isPageComplete() { - if(errMsg != null && !"".equals(errMsg)){ + if(errMsg != null && !"".equals(errMsg)){ //$NON-NLS-1$ return false; } if (btnServerSupplied.getSelection() @@ -337,12 +340,12 @@ protected String getDuplicateJars(String jbwsName) throws JavaModelException{ String prjName = model.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME); - if(prjName == null || "".equals(prjName)){ - return ""; + if(prjName == null || "".equals(prjName)){ //$NON-NLS-1$ + return ""; //$NON-NLS-1$ } IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(prjName); if(!project.exists()){ - return ""; + return ""; //$NON-NLS-1$ } List<String> allExistingJars = new ArrayList<String>(); @@ -359,7 +362,7 @@ IClasspathEntry[] entries = javaProject.getRawClasspath(); for(IClasspathEntry entry: entries){ if(entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER){ - if("JBossWS_Runtime".equals(entry.getPath().segment(0))){ + if("JBossWS_Runtime".equals(entry.getPath().segment(0))){ //$NON-NLS-1$ continue; } IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), javaProject); @@ -377,7 +380,7 @@ } } - return ""; + return ""; //$NON-NLS-1$ } } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -53,7 +53,7 @@ // custom package name Label lblCustomPakage = new Label(configCom, SWT.NONE); lblCustomPakage - .setText(JBossWSCreationCoreMessages.Label_Custom_Package_Name); //$NON-NLS-1$ + .setText(JBossWSCreationCoreMessages.Label_Custom_Package_Name); final Text txtCustomPkgName = new Text(configCom, SWT.BORDER); txtCustomPkgName.setText(model.getCustomPackage()); GridData gd = new GridData(GridData.FILL_HORIZONTAL); @@ -68,10 +68,10 @@ // target new Label(configCom, SWT.NONE) - .setText(JBossWSCreationCoreMessages.Label_JaxWS_Target); //$NON-NLS-1$ + .setText(JBossWSCreationCoreMessages.Label_JaxWS_Target); final Combo cbSpec = new Combo(configCom, SWT.BORDER | SWT.READ_ONLY); - cbSpec.add(JBossWSCreationCoreMessages.Value_Target_0, 0); //$NON-NLS-1$ - cbSpec.add(JBossWSCreationCoreMessages.Value_Target_1, 1); //$NON-NLS-1$ + cbSpec.add(JBossWSCreationCoreMessages.Value_Target_0, 0); + cbSpec.add(JBossWSCreationCoreMessages.Value_Target_1, 1); if (JBossWSCreationCoreMessages.Value_Target_0 .equals(model.getTarget())) { cbSpec.select(0); @@ -90,12 +90,12 @@ // catalog file new Label(configCom, SWT.NONE) - .setText(JBossWSCreationCoreMessages.Label_Catalog_File); //$NON-NLS-1$ + .setText(JBossWSCreationCoreMessages.Label_Catalog_File); final Text txtCatlog = new Text(configCom, SWT.BORDER); txtCatlog.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); Button btnCatlog = new Button(configCom, SWT.NONE); btnCatlog - .setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion); //$NON-NLS-1$ + .setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion); btnCatlog.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { String fileLocation = new FileDialog(Display.getCurrent() @@ -107,7 +107,7 @@ // binding files new Label(configCom, SWT.NONE) - .setText(JBossWSCreationCoreMessages.Label_Binding_File); //$NON-NLS-1$ + .setText(JBossWSCreationCoreMessages.Label_Binding_File); final List bindingList = new List(configCom, SWT.BORDER | SWT.SCROLL_LINE | SWT.V_SCROLL | SWT.H_SCROLL); @@ -128,7 +128,7 @@ Button btnSelect = new Button(configCom, SWT.NONE); btnSelect - .setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion); //$NON-NLS-1$ + .setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion); btnSelect.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSConfigWidgetFactory.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSConfigWidgetFactory.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSConfigWidgetFactory.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -10,6 +10,7 @@ import org.jboss.tools.ws.creation.core.commands.InitialClientCommand; import org.jboss.tools.ws.creation.core.commands.InitialCommand; import org.jboss.tools.ws.creation.core.data.ServiceModel; +import org.jboss.tools.ws.creation.ui.Messages; import org.jboss.tools.ws.creation.ui.widgets.CodeGenConfigWidget; public class JBossWSConfigWidgetFactory implements @@ -46,7 +47,7 @@ dataRegistry.addMapping(InitialCommand.class, "WebServiceDataModel", //$NON-NLS-1$ JBossWSConfigWidgetFactory.class); dataRegistry.addMapping(InitialClientCommand.class, - "WebServiceDataModel", JBossWSConfigWidgetFactory.class); + "WebServiceDataModel", JBossWSConfigWidgetFactory.class); //$NON-NLS-1$ } public void setWebServiceDataModel(ServiceModel model) { @@ -60,8 +61,8 @@ servicesXMLSelectWidget = new CodeGenConfigWidget(model); servicesXMLSelectWidgetContrib = createWidgetContributor( - "JBoss Web Service Code Generation Configuration", - "Please input the appropriate option for the code generation", + Messages.JBossWSConfigWidgetFactory_Title, + Messages.JBossWSConfigWidgetFactory_Description, servicesXMLSelectWidget); } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSProviderInvokeConfigWidgetFactory.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSProviderInvokeConfigWidgetFactory.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSProviderInvokeConfigWidgetFactory.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -20,6 +20,7 @@ import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataContributor; import org.jboss.tools.ws.creation.core.commands.InitialCommand; import org.jboss.tools.ws.creation.core.data.ServiceModel; +import org.jboss.tools.ws.creation.ui.Messages; import org.jboss.tools.ws.creation.ui.widgets.ProviderInvokeCodeGenConfigWidget; /** @@ -68,8 +69,8 @@ ProviderInvokeCodeGenConfigWidget java2WSDLWidget = new ProviderInvokeCodeGenConfigWidget( model); servicesXMLSelectWidgetContrib = createWidgetContributor( - "JBoss Web Service Code Generation Configuration", - "Please input the appropriate option for the code generation", + Messages.JBossWSProviderInvokeConfigWidgetFactory_Title, + Messages.JBossWSProviderInvokeConfigWidgetFactory_Description, java2WSDLWidget); } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/.settings/org.eclipse.jdt.core.prefs 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/.settings/org.eclipse.jdt.core.prefs 2009-07-01 05:00:51 UTC (rev 16306) @@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning org.eclipse.jdt.core.compiler.source=1.5 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/JBossWSUIPlugin.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/JBossWSUIPlugin.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/JBossWSUIPlugin.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -21,7 +21,7 @@ public class JBossWSUIPlugin extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.ws.ui"; + public static final String PLUGIN_ID = "org.jboss.tools.ws.ui"; //$NON-NLS-1$ // The shared instance private static JBossWSUIPlugin plugin; Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/UIUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/UIUtils.java 2009-07-01 04:03:44 UTC (rev 16305) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/UIUtils.java 2009-07-01 05:00:51 UTC (rev 16306) @@ -78,7 +78,7 @@ if (infopop != null) PlatformUI.getWorkbench().getHelpSystem().setHelp(button, - infoPopid_ + "." + infopop); + infoPopid_ + "." + infopop); //$NON-NLS-1$ return button; } @@ -102,7 +102,7 @@ if (infopop != null) PlatformUI.getWorkbench().getHelpSystem().setHelp(combo, - infoPopid_ + "." + infopop); + infoPopid_ + "." + infopop); //$NON-NLS-1$ return combo; } @@ -126,7 +126,7 @@ if (infopop != null) PlatformUI.getWorkbench().getHelpSystem().setHelp(text, - infoPopid_ + "." + infopop); + infoPopid_ + "." + infopop); //$NON-NLS-1$ return text; } @@ -184,7 +184,7 @@ if (infopop != null) PlatformUI.getWorkbench().getHelpSystem().setHelp(newGroup, - infoPopid_ + "." + infopop); + infoPopid_ + "." + infopop); //$NON-NLS-1$ return newGroup; } @@ -192,7 +192,7 @@ public Tree createTree(Composite parent, String tooltip, String infopop, int style) { - tooltip = tooltip == null ? "" : tooltip; + tooltip = tooltip == null ? "" : tooltip; //$NON-NLS-1$ Tree tree = new Tree(parent, style); @@ -201,7 +201,7 @@ if (infopop != null) PlatformUI.getWorkbench().getHelpSystem().setHelp(tree, - infoPopid_ + "." + infopop); + infoPopid_ + "." + infopop); //$NON-NLS-1$ return tree; @@ -210,7 +210,7 @@ public Table createTable(Composite parent, String tooltip, String infopop, int style) { - tooltip = tooltip == null ? "" : tooltip; + tooltip = tooltip == null ? "" : tooltip; //$NON-NLS-1$ Table table = new Table(parent, style); @@ -219,7 +219,7 @@ if (infopop != null) PlatformUI.getWorkbench().getHelpSystem().setHelp(table, - infoPopid_ + "." + infopop); + infoPopid_ + "." + infopop); //$NON-NLS-1$ return table; @@ -247,7 +247,7 @@ public void createInfoPop(Control ctrl, String infopop) { if (infopop != null) PlatformUI.getWorkbench().getHelpSystem().setHelp(ctrl, - infoPopid_ + "." + infopop); + infoPopid_ + "." + infopop); //$NON-NLS-1$ } /** @@ -275,8 +275,8 @@ public static void writePropertyToFile(File file,String key, String value) throws IOException { Writer out = new BufferedWriter(new OutputStreamWriter( - new FileOutputStream(file), "8859_1")); - out.write(key+"="+value+"\n"); + new FileOutputStream(file), "8859_1")); //$NON-NLS-1$ + out.write(key+"="+value+"\n"); //$NON-NLS-1$ //$NON-NLS-2$ out.close(); } @@ -440,7 +440,7 @@ public static String addNodesToURL(String currentPath, String[] newNode) { String returnPath=currentPath; for (int i = 0; i < newNode.length; i++) { - returnPath = returnPath + "/" + newNode[i]; + returnPath = returnPath + "/" + newNode[i]; //$NON-NLS-1$ } return returnPath; }