JBoss Tools SVN: r14581 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: ui/editors and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-04-07 21:27:43 -0400 (Tue, 07 Apr 2009)
New Revision: 14581
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/messages.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/messages.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/messages.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/messages.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/messages.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/messages.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/messages.properties
Log:
JBIDE-3557 Externalise English strings - converted some Eclipse message bundles to new-style, replaced concatenated strings with NLS.bind() calls, marked apparently obsolete messages as non-translatable.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/messages.properties 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/messages.properties 2009-04-08 01:27:43 UTC (rev 14581)
@@ -21,19 +21,28 @@
SmooksGraphicalFormPage.TargetSelectLinkText=Target Select
SmooksNormalContentEditFormPage.ConfigurationPageText=Configuration Page
SmooksNormalContentEditFormPage.SmooksParseType=Other Configurations
+# START NON-TRANSLATABLE
+# suspected OBSOLETE
SmooksResourceConfigFormBlock.BeanPopulator=BeanPopulator \:
+# END NON-TRANSLATABLE
SmooksResourceConfigFormBlock.DateType=Resource configurations
SmooksResourceConfigFormBlock.DeleteButton=Delete
SmooksResourceConfigFormBlock.DownButton=Down
SmooksResourceConfigFormBlock.NewButton=New
SmooksResourceConfigFormBlock.NULLString=<NULL>
SmooksResourceConfigFormBlock.TemplateFile=Template File:
+# START NON-TRANSLATABLE
+# suspected OBSOLETE
SmooksResourceConfigFormBlock.UnknownResourceConfig=UnKnown ResourceConfig -
+# END NON-TRANSLATABLE
SmooksResourceConfigFormBlock.UpButton=Up
TypeIDSelectionWizard.TypeIDSelection=TypeID Selection
TypeIDSelectionWizardPage.NameColumn=Name
+# START NON-TRANSLATABLE
+# suspected OBSOLETE
TypeIDSelectionWizardPage.SourceTypeIDTitle=Source Data Type ID List \:
TypeIDSelectionWizardPage.TargetTypeIDTitle=Target Data Type ID List \:
+# END NON-TRANSLATABLE
TypeIDSelectionWizardPage.TypeIDSelectionWizardPageDescription=Select the data type for source/target data
TypeIDSelectionWizardPage.TypeIDSelectionWizardPageTitle=Select Source/Target Data Type
TypeIDSelectionWizardPage.WarningMessage=Please select the data type first
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/messages.properties 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/messages.properties 2009-04-08 01:27:43 UTC (rev 14581)
@@ -7,6 +7,7 @@
SmooksResourceChangeListener.ConverFileMsg2=\ already exists. Overwrite the file?
SmooksResourceChangeListener.CoverFile=Cover
# START NON-TRANSLATABLE
+# suspected OBSOLETE
SmooksResourceChangeListener.SmooksFileExtensionName=smooks
SmooksResourceChangeListener.SmooksGraphFileExtensionName=.graph
# END NON-TRANSLATABLE
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/Messages.java 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/Messages.java 2009-04-08 01:27:43 UTC (rev 14581)
@@ -1,23 +1,27 @@
-package org.jboss.tools.smooks.utils;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
- private static final String BUNDLE_NAME = "org.jboss.tools.smooks.utils.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-
-}
+package org.jboss.tools.smooks.utils;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+
+ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.utils.messages";//$NON-NLS-1$
+
+ private Messages() {
+ // Do not instantiate
+ }
+
+ public static String UIUtils_ConnectAllConnections;
+ public static String UIUtils_ConnectNode;
+ public static String UIUtils_DisconnectAllConnections;
+ public static String UIUtils_InstanceClassResolveMessage1;
+ public static String UIUtils_InstanceClassResolveMessage2;
+ public static String UIUtils_InstanceLoadedErrorMessage;
+ public static String UIUtils_InstanceLoadedResolveMessage;
+ public static String UIUtils_JavaModelLoadedErrorMessage;
+ public static String UIUtils_ParentNodeConnectErrorMessage;
+ public static String UIUtils_SelectorCheckErrorMessage;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+}
\ No newline at end of file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2009-04-08 01:27:43 UTC (rev 14581)
@@ -147,8 +147,7 @@
if (selector.indexOf(splitString) != -1) {
throw new InvocationTargetException(
new Exception(
- NLS.bind(Messages
- .getString("UIUtils.SelectorCheckErrorMessage"), //$NON-NLS-1$
+ NLS.bind(Messages.UIUtils_SelectorCheckErrorMessage, //$NON-NLS-1$
splitString,
selector)));
}
@@ -275,10 +274,8 @@
context);
CompositeResolveCommand compositeCommand = new CompositeResolveCommand(
context);
- compositeCommand.setResolveDescription(Messages
- .getString("UIUtils.ConnectAllConnections")); //$NON-NLS-1$
- disconnectCommand.setResolveDescription(NLS.bind(Messages
- .getString("UIUtils.DisconnectAllConnections"), //$NON-NLS-1$
+ compositeCommand.setResolveDescription(Messages.UIUtils_ConnectAllConnections); //$NON-NLS-1$
+ disconnectCommand.setResolveDescription(NLS.bind(Messages.UIUtils_DisconnectAllConnections, //$NON-NLS-1$
currentNode.getName()));
AbstractStructuredDataModel targetNode = UIUtils.findGraphModel(root,
currentNode);
@@ -304,8 +301,7 @@
if (tempMap.get(sourceParentNode) == null) {
JavaModelConnectionResolveCommand connectParent = new JavaModelConnectionResolveCommand(
context);
- String desc = NLS.bind(Messages
- .getString("UIUtils.ConnectNode"), //$NON-NLS-1$
+ String desc = NLS.bind(Messages.UIUtils_ConnectNode, //$NON-NLS-1$
context.getSourceViewerLabelProvider().getText(
sourceParent),
parentNode.getName());
@@ -351,8 +347,7 @@
if (pgm != null && pgm instanceof IConnectableModel) {
if (((IConnectableModel) pgm)
.getModelTargetConnections().isEmpty()) {
- String errorMessage = NLS.bind(Messages
- .getString("UIUtils.ParentNodeConnectErrorMessage"), //$NON-NLS-1$
+ String errorMessage = NLS.bind(Messages.UIUtils_ParentNodeConnectErrorMessage, //$NON-NLS-1$
javaModel.getName(),
parent.getName());
DesignTimeAnalyzeResult dr = new DesignTimeAnalyzeResult();
@@ -398,15 +393,13 @@
if (instanceClazz == null) {
DesignTimeAnalyzeResult result = new DesignTimeAnalyzeResult();
result
- .setErrorMessage(NLS.bind(Messages
- .getString("UIUtils.InstanceLoadedErrorMessage"), //$NON-NLS-1$
+ .setErrorMessage(NLS.bind(Messages.UIUtils_InstanceLoadedErrorMessage, //$NON-NLS-1$
((JavaBeanModel) refObj).getName(),
instanceName));
JavaModelResolveCommand command = new JavaModelResolveCommand(
context);
command
- .setResolveDescription(NLS.bind(Messages
- .getString("UIUtils.InstanceLoadedResolveMessage"), //$NON-NLS-1$
+ .setResolveDescription(NLS.bind(Messages.UIUtils_InstanceLoadedResolveMessage, //$NON-NLS-1$
instanceName));
command.setInstanceName(instanceName);
command.setJavaBean((JavaBeanModel) refObj);
@@ -416,19 +409,16 @@
if (instanceClazz != null && instanceClazz.isInterface()) {
DesignTimeAnalyzeResult result = new DesignTimeAnalyzeResult();
result
- .setErrorMessage(NLS.bind(Messages
- .getString("UIUtils.JavaModelLoadedErrorMessage"), //$NON-NLS-1$
+ .setErrorMessage(NLS.bind(Messages.UIUtils_JavaModelLoadedErrorMessage, //$NON-NLS-1$
((JavaBeanModel) refObj).getName(),
instanceName));
if (List.class.isAssignableFrom(instanceClazz)) {
JavaModelResolveCommand command = new JavaModelResolveCommand(
context);
command
- .setResolveDescription(Messages
- .getString("UIUtils.InstanceClassResolveMessage1")); //$NON-NLS-1$
+ .setResolveDescription(Messages.UIUtils_InstanceClassResolveMessage1); //$NON-NLS-1$
command
- .setInstanceName(Messages
- .getString("UIUtils.InstanceClassResolveMessage2")); //$NON-NLS-1$
+ .setInstanceName(Messages.UIUtils_InstanceClassResolveMessage2); //$NON-NLS-1$
command.setJavaBean((JavaBeanModel) refObj);
result.addResolveCommand(command);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/messages.properties 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/messages.properties 2009-04-08 01:27:43 UTC (rev 14581)
@@ -1,10 +1,10 @@
-UIUtils.ConnectAllConnections=Make all necessary connections
-UIUtils.ConnectNode=Connect the "{0}" to the "{1}"
-UIUtils.DisconnectAllConnections=Disconnect all connections of the current "{0}"node
-UIUtils.InstanceClassResolveMessage1=Change the instance class to "java.util.ArrayList"
-UIUtils.InstanceClassResolveMessage2=java.util.ArrayList
-UIUtils.InstanceLoadedErrorMessage=The instance class of "{0}" can not be loaded. The instance name is "{1}"
-UIUtils.InstanceLoadedResolveMessage=Change the instance class to "{0}"
-UIUtils.JavaModelLoadedErrorMessage=Java model "{0}" can not be instantiated. The instance name is "{1}"
-UIUtils.ParentNodeConnectErrorMessage=The parent of Java node "{0}" : "{1}" is not connected to any source node
-UIUtils.SelectorCheckErrorMessage=The Selector string does not support "{0}" character. Selector is "{1}"
+UIUtils_ConnectAllConnections=Make all necessary connections
+UIUtils_ConnectNode=Connect the "{0}" to the "{1}"
+UIUtils_DisconnectAllConnections=Disconnect all connections of the current "{0}"node
+UIUtils_InstanceClassResolveMessage1=Change the instance class to "java.util.ArrayList"
+UIUtils_InstanceClassResolveMessage2=java.util.ArrayList
+UIUtils_InstanceLoadedErrorMessage=The instance class of "{0}" can not be loaded. The instance name is "{1}"
+UIUtils_InstanceLoadedResolveMessage=Change the instance class to "{0}"
+UIUtils_JavaModelLoadedErrorMessage=Java model "{0}" can not be instantiated. The instance name is "{1}"
+UIUtils_ParentNodeConnectErrorMessage=The parent of Java node "{0}" : "{1}" is not connected to any source node
+UIUtils_SelectorCheckErrorMessage=The Selector string does not support "{0}" character. Selector is "{1}"
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2009-04-08 01:27:43 UTC (rev 14581)
@@ -174,7 +174,7 @@
xsdComposite.setLayout(xsdLayout);
Label nfileLanel = new Label(xsdComposite, SWT.NONE);
- nfileLanel.setText(Messages.getString("AbstractFileSelectionWizardPage.XMLFilePathLabelText")); //$NON-NLS-1$
+ nfileLanel.setText(Messages.AbstractFileSelectionWizardPage_XMLFilePathLabelText);
fileTextComposite = new Composite(xsdComposite, SWT.NONE);
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.grabExcessHorizontalSpace = true;
@@ -223,10 +223,10 @@
browseButtonComposite.setLayout(bg);
fileSystemBrowseButton = new Button(browseButtonComposite, SWT.NONE);
- fileSystemBrowseButton.setText(Messages.getString("AbstractFileSelectionWizardPage.BrowseFileSystemButtonText")); //$NON-NLS-1$
+ fileSystemBrowseButton.setText(Messages.AbstractFileSelectionWizardPage_BrowseFileSystemButtonText);
workspaceBrowseButton = new Button(browseButtonComposite, SWT.NONE);
- workspaceBrowseButton.setText(Messages.getString("AbstractFileSelectionWizardPage.BrowseWorkspaceButtonText")); //$NON-NLS-1$
+ workspaceBrowseButton.setText(Messages.AbstractFileSelectionWizardPage_BrowseWorkspaceButtonText);
gd = new GridData();
gd.horizontalAlignment = GridData.END;
workspaceBrowseButton.setLayoutData(gd);
@@ -291,7 +291,7 @@
String text = this.fileText.getText();
String error = null;
if (text == null || "".equals(text)) //$NON-NLS-1$
- error = Messages.getString("AbstractFileSelectionWizardPage.Errormessage"); //$NON-NLS-1$
+ error = Messages.AbstractFileSelectionWizardPage_Errormessage;
// File tempFile = new File(text);
// if(!tempFile.exists()){
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/Messages.java 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/Messages.java 2009-04-08 01:27:43 UTC (rev 14581)
@@ -1,22 +1,21 @@
-package org.jboss.tools.smooks.xml;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
- private static final String BUNDLE_NAME = "org.jboss.tools.smooks.xml.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
+package org.jboss.tools.smooks.xml;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+
+ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.xml.messages";//$NON-NLS-1$
+
+ private Messages() {
+ // Do not instantiate
+ }
+
+ public static String AbstractFileSelectionWizardPage_BrowseFileSystemButtonText;
+ public static String AbstractFileSelectionWizardPage_BrowseWorkspaceButtonText;
+ public static String AbstractFileSelectionWizardPage_Errormessage;
+ public static String AbstractFileSelectionWizardPage_XMLFilePathLabelText;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+}
\ No newline at end of file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/messages.properties 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/messages.properties 2009-04-08 01:27:43 UTC (rev 14581)
@@ -1,4 +1,4 @@
-AbstractFileSelectionWizardPage.BrowseFileSystemButtonText=Browse File System...
-AbstractFileSelectionWizardPage.BrowseWorkspaceButtonText=Browse Workspace...
-AbstractFileSelectionWizardPage.Errormessage=Please select a file
-AbstractFileSelectionWizardPage.XMLFilePathLabelText=XML File Path:
+AbstractFileSelectionWizardPage_BrowseFileSystemButtonText=Browse File System...
+AbstractFileSelectionWizardPage_BrowseWorkspaceButtonText=Browse Workspace...
+AbstractFileSelectionWizardPage_Errormessage=Please select a file
+AbstractFileSelectionWizardPage_XMLFilePathLabelText=XML File Path:
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/Messages.java 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/Messages.java 2009-04-08 01:27:43 UTC (rev 14581)
@@ -1,22 +1,19 @@
-package org.jboss.tools.smooks.xml.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
- private static final String BUNDLE_NAME = "org.jboss.tools.smooks.xml.ui.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
+package org.jboss.tools.smooks.xml.ui;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+
+ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.xml.ui.messages";//$NON-NLS-1$
+
+ private Messages() {
+ // Do not instantiate
+ }
+
+ public static String XMLStructuredDataWizardPage_XMLDataWizardPageDescription;
+ public static String XMLStructuredDataWizardPage_XMLDataWizardPageTitle;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+}
\ No newline at end of file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java 2009-04-08 01:27:43 UTC (rev 14581)
@@ -20,8 +20,8 @@
}
private void setPageText() {
- this.setTitle(Messages.getString("XMLStructuredDataWizardPage.XMLDataWizardPageTitle")); //$NON-NLS-1$
- this.setDescription(Messages.getString("XMLStructuredDataWizardPage.XMLDataWizardPageDescription")); //$NON-NLS-1$
+ this.setTitle(Messages.XMLStructuredDataWizardPage_XMLDataWizardPageTitle);
+ this.setDescription(Messages.XMLStructuredDataWizardPage_XMLDataWizardPageDescription);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/messages.properties 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/messages.properties 2009-04-08 01:27:43 UTC (rev 14581)
@@ -1,2 +1,2 @@
-XMLStructuredDataWizardPage.XMLDataWizardPageDescription=Select a .xml file for configuration data
-XMLStructuredDataWizardPage.XMLDataWizardPageTitle=Select a XML file
+XMLStructuredDataWizardPage_XMLDataWizardPageDescription=Select a .xml file for configuration data
+XMLStructuredDataWizardPage_XMLDataWizardPageTitle=Select a XML file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java 2009-04-08 01:27:43 UTC (rev 14581)
@@ -24,6 +24,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Path;
+import org.eclipse.osgi.util.NLS;
import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer;
import org.jboss.tools.smooks.analyzer.ITargetModelAnalyzer;
import org.jboss.tools.smooks.graphical.GraphInformations;
@@ -49,9 +50,9 @@
public static final String WORKSPACE_PRIX = "Workspace:/"; //$NON-NLS-1$
- public static final String RESOURCE = "Resource:/";
+ public static final String RESOURCE = "Resource:/"; //$NON-NLS-1$
- public static final String XSL_NAMESPACE = " xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" ";
+ public static final String XSL_NAMESPACE = " xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" "; //$NON-NLS-1$
private String parmaKey = ""; //$NON-NLS-1$
@@ -77,14 +78,12 @@
} else {
throw new InvocationTargetException(
new Exception(
- Messages
- .getString("AbstractXMLModelAnalyzer.FileDosentExistErrorMessage1") + path + Messages.getString("AbstractXMLModelAnalyzer.FileDosentExistErrorMessage2"))); //$NON-NLS-1$ //$NON-NLS-2$
+ NLS.bind(Messages.AbstractXMLModelAnalyzer_FileDosentExistErrorMessage, path)));
}
} else {
throw new InvocationTargetException(
new Exception(
- Messages
- .getString("AbstractXMLModelAnalyzer.IllegalPathErrorMessage1") + path + ".")); //$NON-NLS-1$ //$NON-NLS-2$
+ NLS.bind(Messages.AbstractXMLModelAnalyzer_IllegalPathErrorMessage, path)));
}
}
return path;
@@ -134,9 +133,9 @@
} else {
String sid = graphInfo.getMappingType().getSourceTypeID();
String tid = graphInfo.getMappingType().getTargetTypeID();
- if (sid.equals("org.jboss.tools.smooks.xml.viewerInitor.xml")
+ if (sid.equals("org.jboss.tools.smooks.xml.viewerInitor.xml") //$NON-NLS-1$
&& tid
- .equals("org.jboss.tools.smooks.xml.viewerInitor.xml")) {
+ .equals("org.jboss.tools.smooks.xml.viewerInitor.xml")) { //$NON-NLS-1$
List list = listType.getAbstractResourceConfig();
for (Iterator iterator = list.iterator(); iterator.hasNext();) {
AbstractResourceConfig re = (AbstractResourceConfig) iterator
@@ -145,7 +144,7 @@
ResourceConfigType config = (ResourceConfigType) re;
ResourceType resource = config.getResource();
if (resource != null) {
- if ("xsl".equals(resource.getType())) {
+ if ("xsl".equals(resource.getType())) { //$NON-NLS-1$
String cdata = resource.getCDATAValue();
if (cdata != null) {
cdata = processXSLFragmentString(cdata);
@@ -157,8 +156,8 @@
cdata
.getBytes()),
new String[] {
- "value-of",
- "null_xsl" });
+ "value-of", //$NON-NLS-1$
+ "null_xsl" }); //$NON-NLS-1$
if (tag != null) {
if (viewer instanceof PropertyChangeListener) {
document
@@ -189,15 +188,15 @@
private String processXSLFragmentString(String cdata) {
// cdata = cdata.replaceAll(":", "-");
- int start_index = cdata.indexOf("<");
- int end_index = cdata.indexOf("/>");
+ int start_index = cdata.indexOf("<"); //$NON-NLS-1$
+ int end_index = cdata.indexOf("/>"); //$NON-NLS-1$
if (end_index == -1) {
- end_index = cdata.indexOf(">");
+ end_index = cdata.indexOf(">"); //$NON-NLS-1$
}
if (start_index == -1 || end_index == -1)
return cdata;
String contents = cdata.substring(start_index, end_index);
- if (contents.indexOf("\"http://www.w3.org/1999/XSL/Transform\"") != -1) {
+ if (contents.indexOf("\"http://www.w3.org/1999/XSL/Transform\"") != -1) { //$NON-NLS-1$
return cdata;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/Messages.java 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/Messages.java 2009-04-08 01:27:43 UTC (rev 14581)
@@ -1,22 +1,23 @@
-package org.jboss.tools.smooks.xml2java.analyzer;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
- private static final String BUNDLE_NAME = "org.jboss.tools.smooks.xml2java.analyzer.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
+package org.jboss.tools.smooks.xml2java.analyzer;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+
+ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.xml2java.analyzer.messages";//$NON-NLS-1$
+
+ private Messages() {
+ // Do not instantiate
+ }
+
+ public static String AbstractXMLModelAnalyzer_FileDosentExistErrorMessage;
+ public static String AbstractXMLModelAnalyzer_IllegalPathErrorMessage;
+ public static String XML2JavaAnalyzer_CantFindNodeErrorMessage;
+ public static String XML2JavaAnalyzer_CantFindRootNodeErrorMessage;
+ public static String XML2JavaAnalyzer_ConnectQDlgContent;
+ public static String XML2JavaAnalyzer_ConnectQDlgTitle;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+}
\ No newline at end of file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2009-04-08 01:27:43 UTC (rev 14581)
@@ -17,6 +17,7 @@
import org.eclipse.emf.ecore.xml.type.AnyType;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Shell;
import org.jboss.tools.smooks.analyzer.AbstractAnalyzer;
import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult;
@@ -349,8 +350,7 @@
// TODO if can't find the root , throw exception
// MODIFY by Dart 2008.11.17
throw new RuntimeException(
- Messages
- .getString("XML2JavaAnalyzer.CantFindRootNodeErrorMessage") + " : " + selector); //$NON-NLS-1$
+ NLS.bind(Messages.XML2JavaAnalyzer_CantFindRootNodeErrorMessage, selector));
// return MappingResourceConfigList.createEmptyList();
}
JavaBeanModel target = findJavaBeanModel(((List) targetObject),
@@ -358,7 +358,7 @@
if (target == null) {
// TODO if can't find the root , throw exception
// MODIFY by Dart 2008.11.17
- String clazzName = SmooksModelUtils.getParmaText("beanClass",
+ String clazzName = SmooksModelUtils.getParmaText("beanClass", //$NON-NLS-1$
resourceConfig);
if (clazzName != null)
throw new RuntimeException("Can't find the Java class"
@@ -380,7 +380,7 @@
JavaBeanModel bean = (JavaBeanModel) iterator.next();
Class clazz = bean.getBeanClass();
if (clazz != null) {
- String clazzName = SmooksModelUtils.getParmaText("beanClass",
+ String clazzName = SmooksModelUtils.getParmaText("beanClass", //$NON-NLS-1$
resourceConfig);
if (clazzName != null)
clazzName = clazzName.trim();
@@ -473,7 +473,7 @@
String namespace = config.getSelectorNamespace();
if (namespace != null) {
PropertyModel np = new PropertyModel();
- np.setName("selector-namespace");
+ np.setName("selector-namespace"); //$NON-NLS-1$
np.setValue(namespace);
mapping.getProperties().add(np);
}
@@ -560,8 +560,7 @@
// TODO If can't find the element , throw exception
// MODIFY by Dart , 2008.11.07
throw new RuntimeException(
- Messages
- .getString("XML2JavaAnalyzer.CantFindNodeErrorMessage1") + newSelector + Messages.getString("XML2JavaAnalyzer.CantFindNodeErrorMessage2")); //$NON-NLS-1$ //$NON-NLS-2$
+ NLS.bind(Messages.XML2JavaAnalyzer_CantFindNodeErrorMessage, newSelector));
}
createMappingResourceConfigList(configList, listType,
processingResourceConfig, newRoot, targetBean);
@@ -573,8 +572,7 @@
// TODO If can't find the element , throw exception
// MODIFY by Dart , 2008.11.07
throw new RuntimeException(
- Messages
- .getString("XML2JavaAnalyzer.CantFindNodeErrorMessage1") + selector + Messages.getString("XML2JavaAnalyzer.CantFindNodeErrorMessage2")); //$NON-NLS-1$ //$NON-NLS-2$
+ NLS.bind(Messages.XML2JavaAnalyzer_CantFindNodeErrorMessage, selector));
}
if (source != null) {
MappingModel mapping = new MappingModel(source, targetBean);
@@ -620,7 +618,7 @@
}
public static boolean isXMLAttributeObject(String name) {
- if (name != null && name.startsWith("@"))
+ if (name != null && name.startsWith("@")) //$NON-NLS-1$
return true;
return false;
}
@@ -709,10 +707,8 @@
boolean connectAuto = MessageDialog
.openQuestion(
displayParent,
- Messages
- .getString("XML2JavaAnalyzer.ConnectQDlgTitle"), //$NON-NLS-1$
- Messages
- .getString("XML2JavaAnalyzer.ConnectQDlgContent")); //$NON-NLS-1$
+ Messages.XML2JavaAnalyzer_ConnectQDlgTitle,
+ Messages.XML2JavaAnalyzer_ConnectQDlgContent);
if (connectAuto) {
// connect root model
LineConnectionModel connectionModel = new LineConnectionModel();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/messages.properties 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/messages.properties 2009-04-08 01:27:43 UTC (rev 14581)
@@ -1,8 +1,6 @@
-AbstractXMLModelAnalyzer.FileDosentExistErrorMessage1=File does not exist
-AbstractXMLModelAnalyzer.FileDosentExistErrorMessage2=\ in the workspace.
-AbstractXMLModelAnalyzer.IllegalPathErrorMessage1=Illegal file path:
-XML2JavaAnalyzer.CantFindNodeErrorMessage1=Can not find the "
-XML2JavaAnalyzer.CantFindNodeErrorMessage2=" node.
-XML2JavaAnalyzer.CantFindRootNodeErrorMessage=Can not find the root node.
-XML2JavaAnalyzer.ConnectQDlgContent=To ensure a correct mapping, the root nodes should be connected.\nDo you want to connect them now?
-XML2JavaAnalyzer.ConnectQDlgTitle=Root Node Connection
+AbstractXMLModelAnalyzer_FileDosentExistErrorMessage=File {0} does not exist in the workspace.
+AbstractXMLModelAnalyzer_IllegalPathErrorMessage=Illegal file path: {0}.
+XML2JavaAnalyzer_CantFindNodeErrorMessage=Can not find the "{0}" node.
+XML2JavaAnalyzer_CantFindRootNodeErrorMessage=Can not find the root node. : {0}
+XML2JavaAnalyzer_ConnectQDlgContent=To ensure a correct mapping, the root nodes should be connected.\nDo you want to connect them now?
+XML2JavaAnalyzer_ConnectQDlgTitle=Root Node Connection
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/messages.properties 2009-04-08 00:21:47 UTC (rev 14580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/messages.properties 2009-04-08 01:27:43 UTC (rev 14581)
@@ -1,3 +1,6 @@
+# START NON-TRANSLATABLE
+# suspected OBSOLETE
XML2XMLAnalyzer.WarningDlgTitle=Warning
XML2XMLAnalyzer.XML2XMLGenerateErrorMessage=XML2XML is currently not supported
XML2XMLAnalyzer.XML2XMLParseErrorMessage=The Smooks editor currently does not support parsing the XML2XML configuration files.
+# END NON-TRANSLATABLE
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14580 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: javabean/analyzer and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-04-07 20:21:47 -0400 (Tue, 07 Apr 2009)
New Revision: 14580
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/messages.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaModelConnectionResolveCommand.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/messages.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/messages.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/messages.properties
Log:
JBIDE-3557 Externalise English strings - converted some Eclipse message bundles to new-style, replaced concatenated strings with NLS.bind() calls, tidied up some of the English wording.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java 2009-04-08 00:21:47 UTC (rev 14580)
@@ -58,7 +58,7 @@
// TODO will modify soon
if(true){
Shell shell = context.getShell();
- MessageDialog.openWarning(shell, Messages.getString("Java2XMLAnalyzer.Warning"), Messages.getString("Java2XMLAnalyzer.CantGenerateConfig")); //$NON-NLS-1$ //$NON-NLS-2$
+ MessageDialog.openWarning(shell, Messages.Java2XMLAnalyzer_Warning, Messages.Java2XMLAnalyzer_CantGenerateConfig);
return;
}
@@ -77,7 +77,7 @@
}
if (root == null)
- throw new SmooksAnalyzerException(Messages.getString("Java2XMLAnalyzer.CantFindRoot")); //$NON-NLS-1$
+ throw new SmooksAnalyzerException(Messages.Java2XMLAnalyzer_CantFindRoot);
Document document = DocumentHelper.createDocument();
Element rootElement = generateXMLContents(rootModel, root);
document.setRootElement(rootElement);
@@ -156,7 +156,7 @@
public MappingResourceConfigList analyzeMappingSmooksModel(
SmooksResourceListType listType, Object sourceObject,
Object targetObject) {
- throw new RuntimeException(Messages.getString("Java2XMLAnalyzer.DontSupportJ2X")); //$NON-NLS-1$
+ throw new RuntimeException(Messages.Java2XMLAnalyzer_DontSupportJ2X);
}
protected String getTheJavaBeanString(JavaBeanModel currentModel) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Messages.java 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Messages.java 2009-04-08 00:21:47 UTC (rev 14580)
@@ -1,22 +1,21 @@
package org.jboss.tools.smooks.java2xml.analyzer;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
+import org.eclipse.osgi.util.NLS;
-public class Messages {
- private static final String BUNDLE_NAME = "org.jboss.tools.smooks.java2xml.analyzer.messages"; //$NON-NLS-1$
+public final class Messages extends NLS {
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
+ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.java2xml.analyzer.messages";//$NON-NLS-1$
private Messages() {
+ // Do not instantiate
}
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
+ public static String Java2XMLAnalyzer_CantFindRoot;
+ public static String Java2XMLAnalyzer_CantGenerateConfig;
+ public static String Java2XMLAnalyzer_DontSupportJ2X;
+ public static String Java2XMLAnalyzer_Warning;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
-}
+}
\ No newline at end of file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/messages.properties 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/messages.properties 2009-04-08 00:21:47 UTC (rev 14580)
@@ -1,4 +1,4 @@
-Java2XMLAnalyzer.CantFindRoot=Can not find the root element
-Java2XMLAnalyzer.CantGenerateConfig=Java2XML is not supported currently.
-Java2XMLAnalyzer.DontSupportJ2X=The Smooks editor currently does not support parsing Java2XML configuration files.
-Java2XMLAnalyzer.Warning=Warning
+Java2XMLAnalyzer_CantFindRoot=Can not find the root element
+Java2XMLAnalyzer_CantGenerateConfig=Java2XML is not supported currently.
+Java2XMLAnalyzer_DontSupportJ2X=The Smooks editor currently does not support parsing Java2XML configuration files.
+Java2XMLAnalyzer_Warning=Warning
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2009-04-08 00:21:47 UTC (rev 14580)
@@ -29,6 +29,7 @@
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Shell;
import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult;
import org.jboss.tools.smooks.analyzer.IMappingAnalyzer;
@@ -507,10 +508,8 @@
boolean connectAuto = MessageDialog
.openQuestion(
displayParent,
- Messages
- .getString("JavaBeanAnalyzer.ConnectionQuestion"), //$NON-NLS-1$
- Messages
- .getString("JavaBeanAnalyzer.ConnectRootQuestion")); //$NON-NLS-1$
+ Messages.JavaBeanAnalyzer_ConnectionQuestion, //$NON-NLS-1$
+ Messages.JavaBeanAnalyzer_ConnectRootQuestion); //$NON-NLS-1$
if (connectAuto) {
// connect root model
LineConnectionModel connectionModel = new LineConnectionModel();
@@ -968,8 +967,7 @@
model = new JavaBeanModel(null, rootClassName);
model.setRootClassModel(true);
model
- .setError(Messages
- .getString("JavaBeanAnalyzer.ClassNotExist") + rootClassName); //$NON-NLS-1$
+ .setError(NLS.bind(Messages.JavaBeanAnalyzer_ClassNotExist, rootClassName));
model.setProperties(new ArrayList());
isError = true;
}
@@ -1236,7 +1234,7 @@
+ "\" from \"" + parentModel.getName() + "\" model");
model = new JavaBeanModel(null, property);
parentModel.addProperty(model);
- model.setError(Messages.getString("JavaBeanAnalyzer.DontExist")); //$NON-NLS-1$
+ model.setError(Messages.JavaBeanAnalyzer_DoesNotExist);
}
if (isSelectorIsUsed(selector))
return;
@@ -1368,8 +1366,7 @@
// something wrong
if (model == null) {
model = new JavaBeanModel(null, referenceSelector);
- model.setError(Messages
- .getString("JavaBeanAnalyzer.DontExist")); //$NON-NLS-1$
+ model.setError(Messages.JavaBeanAnalyzer_DoesNotExist); //$NON-NLS-1$
model.setProperties(new ArrayList());
setCollectionsInstanceClassName(model, resourceConfig);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaModelConnectionResolveCommand.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaModelConnectionResolveCommand.java 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaModelConnectionResolveCommand.java 2009-04-08 00:21:47 UTC (rev 14580)
@@ -53,7 +53,7 @@
@Override
public void execute() throws Exception {
SmooksConfigurationFileGenerateContext context = getContext();
- if(context == null) throw new RuntimeException(Messages.getString("JavaModelConnectionResolveCommand.SmooksContextIsNull")); //$NON-NLS-1$
+ if(context == null) throw new RuntimeException(Messages.JavaModelConnectionResolveCommand_SmooksContextIsNull);
if(sourceModel != null && targetModel != null){
LineConnectionModel connectionModel = new LineConnectionModel();
connectionModel
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/Messages.java 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/Messages.java 2009-04-08 00:21:47 UTC (rev 14580)
@@ -1,22 +1,22 @@
package org.jboss.tools.smooks.javabean.analyzer;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
+import org.eclipse.osgi.util.NLS;
-public class Messages {
- private static final String BUNDLE_NAME = "org.jboss.tools.smooks.javabean.analyzer.messages"; //$NON-NLS-1$
+public final class Messages extends NLS {
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
+ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.javabean.analyzer.messages";//$NON-NLS-1$
private Messages() {
+ // Do not instantiate
}
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
+ public static String JavaBeanAnalyzer_ClassNotExist;
+ public static String JavaBeanAnalyzer_ConnectionQuestion;
+ public static String JavaBeanAnalyzer_ConnectRootQuestion;
+ public static String JavaBeanAnalyzer_DoesNotExist;
+ public static String JavaModelConnectionResolveCommand_SmooksContextIsNull;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
-}
+}
\ No newline at end of file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/messages.properties 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/messages.properties 2009-04-08 00:21:47 UTC (rev 14580)
@@ -1,5 +1,5 @@
-JavaBeanAnalyzer.ClassNotExist=Can not find the class :
-JavaBeanAnalyzer.ConnectionQuestion=Root Node Connection
-JavaBeanAnalyzer.ConnectRootQuestion=To ensure a correct mapping, the root nodes should be connected.\nDo you want to connect them now?
-JavaBeanAnalyzer.DontExist=Do not exist
-JavaModelConnectionResolveCommand.SmooksContextIsNull=Smooks generated context is NULL
+JavaBeanAnalyzer_ClassNotExist=Can not find the class : {0}
+JavaBeanAnalyzer_ConnectionQuestion=Root Node Connection
+JavaBeanAnalyzer_ConnectRootQuestion=To ensure a correct mapping, the root nodes should be connected.\nDo you want to connect them now?
+JavaBeanAnalyzer_DoesNotExist=Does not exist
+JavaModelConnectionResolveCommand_SmooksContextIsNull=Smooks generated context is NULL
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2009-04-08 00:21:47 UTC (rev 14580)
@@ -23,6 +23,7 @@
import java.util.List;
import java.util.Properties;
+import org.eclipse.osgi.util.NLS;
import org.jboss.tools.smooks.analyzer.IValidatable;
import org.jboss.tools.smooks.javabean.uitils.JavaPropertyUtils;
import org.jboss.tools.smooks.ui.IXMLStructuredObject;
@@ -475,11 +476,14 @@
* @see java.lang.Object#toString()
*/
public String toString() {
- StringBuffer buffer = new StringBuffer(Messages
- .getString("JavaBeanModel.JavaBeanName") + name); //$NON-NLS-1$
+ StringBuilder buffer = new StringBuilder();
if (beanClass != null)
- buffer
- .append(Messages.getString("JavaBeanModel.ClassIs") + this.beanClass.getName()); //$NON-NLS-1$
+ buffer.append(NLS.bind(
+ Messages.JavaBeanModel_JavaBeanDetails, name, this.beanClass.getName()));
+ else
+ buffer.append(NLS.bind(
+ Messages.JavaBeanModel_JavaBeanName, name));
+
if (this.properties != null) {
buffer.append("\n"); //$NON-NLS-1$
for (Iterator iterator = properties.iterator(); iterator.hasNext();) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/Messages.java 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/Messages.java 2009-04-08 00:21:47 UTC (rev 14580)
@@ -1,22 +1,19 @@
package org.jboss.tools.smooks.javabean.model;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
+import org.eclipse.osgi.util.NLS;
-public class Messages {
- private static final String BUNDLE_NAME = "org.jboss.tools.smooks.javabean.model.messages"; //$NON-NLS-1$
+public final class Messages extends NLS {
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
+ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.javabean.model.messages";//$NON-NLS-1$
private Messages() {
+ // Do not instantiate
}
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
+ public static String JavaBeanModel_JavaBeanName;
+ public static String JavaBeanModel_JavaBeanDetails;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
-}
+}
\ No newline at end of file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/messages.properties 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/messages.properties 2009-04-08 00:21:47 UTC (rev 14580)
@@ -1,2 +1,2 @@
-JavaBeanModel.ClassIs=;Class :
-JavaBeanModel.JavaBeanName=JavaBean Name :
+JavaBeanModel_JavaBeanName=JavaBean Name : {0}
+JavaBeanModel_JavaBeanDetails=JavaBean Name : {0};Class : {1}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java 2009-04-08 00:21:47 UTC (rev 14580)
@@ -52,8 +52,8 @@
super("beansearchwizardpage"); //$NON-NLS-1$
this.project = selection;
setPageComplete(true);
- setTitle(Messages.getString("JavaBeanConfigWizardPage.JavaBeanSelectionDialogTitle")); //$NON-NLS-1$
- setDescription(Messages.getString("JavaBeanConfigWizardPage.JavaBeanSelectionDialogDesc")); //$NON-NLS-1$
+ setTitle(Messages.JavaBeanConfigWizardPage_JavaBeanSelectionDialogTitle);
+ setDescription(Messages.JavaBeanConfigWizardPage_JavaBeanSelectionDialogDesc);
}
protected void initilize() {
@@ -82,7 +82,7 @@
protected void updatePage() {
String error = null;
if (project == null) {
- error = Messages.getString("JavaBeanConfigWizardPage.JavaBeanSelectionDialogErrorMsg"); //$NON-NLS-1$
+ error = Messages.JavaBeanConfigWizardPage_JavaBeanSelectionDialogErrorMsg;
}
setPageComplete(error == null);
this.setErrorMessage(error);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java 2009-04-08 00:21:47 UTC (rev 14580)
@@ -90,8 +90,7 @@
// ProgressMonitorDialog(parent.getShell());
if (this.runnableContext == null)
throw new Exception(
- Messages
- .getString("JavaBeanModelLoadComposite.InitRunnableContextException")); //$NON-NLS-1$
+ Messages.JavaBeanModelLoadComposite_InitRunnableContextException);
}
if (project != null) {
@@ -134,8 +133,7 @@
com.setLayout(layout);
Label classLabel = new Label(com, SWT.NULL);
- classLabel.setText(Messages
- .getString("JavaBeanModelLoadComposite.ClassNameText")); //$NON-NLS-1$
+ classLabel.setText(Messages.JavaBeanModelLoadComposite_ClassNameText);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
classLabel.setLayoutData(gd);
@@ -272,10 +270,8 @@
scope,
IJavaElementSearchConstants.CONSIDER_CLASSES_AND_INTERFACES,
false);
- dialog.setMessage(Messages
- .getString("JavaBeanModelLoadComposite.SourceJavaBean")); //$NON-NLS-1$
- dialog.setTitle(Messages
- .getString("JavaBeanModelLoadComposite.SearchJavaType")); //$NON-NLS-1$
+ dialog.setMessage(Messages.JavaBeanModelLoadComposite_SourceJavaBean);
+ dialog.setTitle(Messages.JavaBeanModelLoadComposite_SearchJavaType);
if (dialog.open() == Window.OK) {
Object[] results = dialog.getResult();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java 2009-04-08 00:21:47 UTC (rev 14580)
@@ -87,8 +87,7 @@
.getWidgetFactory();
Section section = createRootSection(factory, parent);
- section.setText(Messages
- .getString("JavaBeanPropertiesSection.JavaBeanProperties")); //$NON-NLS-1$
+ section.setText(Messages.JavaBeanPropertiesSection_JavaBeanProperties);
Composite controlComposite = factory.createComposite(section);
section.setClient(controlComposite);
GridLayout gl = new GridLayout();
@@ -96,8 +95,7 @@
controlComposite.setLayout(gl);
- factory.createLabel(controlComposite, Messages
- .getString("JavaBeanPropertiesSection.TargetInstanceClass")).setVisible(false); //$NON-NLS-1$
+ factory.createLabel(controlComposite, Messages.JavaBeanPropertiesSection_TargetInstanceClass).setVisible(false);
instanceClassComposite = factory.createComposite(controlComposite);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -112,8 +110,7 @@
instanceClassText.setLayoutData(gd);
instanceClassComposite.setVisible(false);
- Button button1 = factory.createButton(instanceClassComposite, Messages
- .getString("JavaBeanPropertiesSection.Browse"), //$NON-NLS-1$
+ Button button1 = factory.createButton(instanceClassComposite, Messages.JavaBeanPropertiesSection_Browse,
SWT.NONE);
button1.addSelectionListener(new SelectionAdapter() {
@@ -124,8 +121,7 @@
});
- factory.createLabel(controlComposite, Messages
- .getString("JavaBeanPropertiesSection.MappingType")); //$NON-NLS-1$
+ factory.createLabel(controlComposite, Messages.JavaBeanPropertiesSection_MappingType);
typeComposite = factory.createComposite(controlComposite);
gd = new GridData(GridData.FILL_HORIZONTAL);
typeComposite.setLayoutData(gd);
@@ -157,8 +153,7 @@
GridLayout buttonLayout = new GridLayout();
buttonLayout.numColumns = 2;
buttonCom.setLayout(buttonLayout);
- Button button3 = factory.createButton(buttonCom, Messages
- .getString("JavaBeanPropertiesSection.ClassBrowse"), //$NON-NLS-1$
+ Button button3 = factory.createButton(buttonCom, Messages.JavaBeanPropertiesSection_ClassBrowse,
SWT.NONE);
button3.addSelectionListener(new SelectionAdapter() {
@@ -169,8 +164,7 @@
});
- Button button2 = factory.createButton(buttonCom, Messages
- .getString("JavaBeanPropertiesSection.CustomTypeBrowse"), //$NON-NLS-1$
+ Button button2 = factory.createButton(buttonCom, Messages.JavaBeanPropertiesSection_CustomTypeBrowse,
SWT.NONE);
button2.addSelectionListener(new SelectionAdapter() {
@@ -229,8 +223,7 @@
MessageDialog
.openError(
this.getPart().getSite().getShell(),
- Messages
- .getString("JavaBeanPropertiesSection.ErrorMessageTitle"), Messages.getString("JavaBeanPropertiesSection.TypeDialogErrorMessage")); //$NON-NLS-1$ //$NON-NLS-2$
+ Messages.JavaBeanPropertiesSection_ErrorMessageTitle, Messages.JavaBeanPropertiesSection_TypeDialogErrorMessage);
return;
}
// TODO should modify the scope to inculde the required projects
@@ -242,10 +235,8 @@
SmooksUIActivator.getDefault().getWorkbench()
.getActiveWorkbenchWindow(), scope,
IJavaElementSearchConstants.CONSIDER_CLASSES, false);
- dialog.setMessage(Messages
- .getString("JavaBeanPropertiesSection.JavaType")); //$NON-NLS-1$
- dialog.setTitle(Messages
- .getString("JavaBeanPropertiesSection.SearchJavaType")); //$NON-NLS-1$
+ dialog.setMessage(Messages.JavaBeanPropertiesSection_JavaType);
+ dialog.setTitle(Messages.JavaBeanPropertiesSection_SearchJavaType);
if (dialog.open() == Window.OK) {
Object[] results = dialog.getResult();
@@ -387,8 +378,7 @@
return null;
for (int i = 0; i < properties.length; i++) {
PropertyModel pro = (PropertyModel) properties[i];
- if (Messages
- .getString("JavaBeanPropertiesSection.TypePropertyName").equalsIgnoreCase(pro.getName())) { //$NON-NLS-1$
+ if (Messages.JavaBeanPropertiesSection_TypePropertyName.equalsIgnoreCase(pro.getName())) {
Object value = pro.getValue();
if(value != null){
return value.toString();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/Messages.java 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/Messages.java 2009-04-08 00:21:47 UTC (rev 14580)
@@ -1,22 +1,36 @@
package org.jboss.tools.smooks.javabean.ui;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
+import org.eclipse.osgi.util.NLS;
-public class Messages {
- private static final String BUNDLE_NAME = "org.jboss.tools.smooks.javabean.ui.messages"; //$NON-NLS-1$
+public final class Messages extends NLS {
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
+ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.javabean.ui.messages";//$NON-NLS-1$
private Messages() {
+ // Do not instantiate
}
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
+ public static String JavaBeanConfigWizardPage_JavaBeanSelectionDialogDesc;
+ public static String JavaBeanConfigWizardPage_JavaBeanSelectionDialogErrorMsg;
+ public static String JavaBeanConfigWizardPage_JavaBeanSelectionDialogTitle;
+// public static String JavaBeanModelLoadComposite_Browse;
+ public static String JavaBeanModelLoadComposite_ClassNameText;
+ public static String JavaBeanModelLoadComposite_InitRunnableContextException;
+ public static String JavaBeanModelLoadComposite_SearchJavaType;
+ public static String JavaBeanModelLoadComposite_SourceJavaBean;
+ public static String JavaBeanPropertiesSection_Browse;
+ public static String JavaBeanPropertiesSection_ClassBrowse;
+ public static String JavaBeanPropertiesSection_CustomTypeBrowse;
+ public static String JavaBeanPropertiesSection_ErrorMessageTitle;
+ public static String JavaBeanPropertiesSection_JavaBeanProperties;
+ public static String JavaBeanPropertiesSection_JavaType;
+ public static String JavaBeanPropertiesSection_MappingType;
+ public static String JavaBeanPropertiesSection_SearchJavaType;
+ public static String JavaBeanPropertiesSection_TargetInstanceClass;
+ public static String JavaBeanPropertiesSection_TypeDialogErrorMessage;
+ public static String JavaBeanPropertiesSection_TypePropertyName;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
-}
+}
\ No newline at end of file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/messages.properties 2009-04-07 22:13:49 UTC (rev 14579)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/messages.properties 2009-04-08 00:21:47 UTC (rev 14580)
@@ -1,19 +1,23 @@
-JavaBeanConfigWizardPage.JavaBeanSelectionDialogDesc=Select the JavaBean class
-JavaBeanConfigWizardPage.JavaBeanSelectionDialogErrorMsg=Please select a Java project.
-JavaBeanConfigWizardPage.JavaBeanSelectionDialogTitle=JavaBean Class selection page
-JavaBeanModelLoadComposite.Browse=Browse...
-JavaBeanModelLoadComposite.ClassNameText=JavaBean Model List \:
-JavaBeanModelLoadComposite.InitRunnableContextException=Unable to init IRunnableContext
-JavaBeanModelLoadComposite.SearchJavaType=Search Java Type
-JavaBeanModelLoadComposite.SourceJavaBean=Source Java Bean:
-JavaBeanPropertiesSection.Browse=Browse
-JavaBeanPropertiesSection.ClassBrowse=Browse class
-JavaBeanPropertiesSection.CustomTypeBrowse=Browse custom type
-JavaBeanPropertiesSection.ErrorMessageTitle=Error
-JavaBeanPropertiesSection.JavaBeanProperties=JavaBean Properties
-JavaBeanPropertiesSection.JavaType=Java Type:
-JavaBeanPropertiesSection.MappingType=Mapping Type \:
-JavaBeanPropertiesSection.SearchJavaType=Search Java Type
-JavaBeanPropertiesSection.TargetInstanceClass=Target instance class name \:
-JavaBeanPropertiesSection.TypeDialogErrorMessage=Unable to open type selection dialog
-JavaBeanPropertiesSection.TypePropertyName=type
+JavaBeanConfigWizardPage_JavaBeanSelectionDialogDesc=Select the JavaBean class
+JavaBeanConfigWizardPage_JavaBeanSelectionDialogErrorMsg=Please select a Java project.
+JavaBeanConfigWizardPage_JavaBeanSelectionDialogTitle=JavaBean Class selection page
+# START NON-TRANSLATABLE
+#JavaBeanModelLoadComposite_Browse=Browse...
+# END NON-TRANSLATABLE
+JavaBeanModelLoadComposite_ClassNameText=JavaBean Model List \:
+JavaBeanModelLoadComposite_InitRunnableContextException=Unable to init IRunnableContext
+JavaBeanModelLoadComposite_SearchJavaType=Search Java Type
+JavaBeanModelLoadComposite_SourceJavaBean=Source Java Bean:
+JavaBeanPropertiesSection_Browse=Browse
+JavaBeanPropertiesSection_ClassBrowse=Browse class
+JavaBeanPropertiesSection_CustomTypeBrowse=Browse custom type
+JavaBeanPropertiesSection_ErrorMessageTitle=Error
+JavaBeanPropertiesSection_JavaBeanProperties=JavaBean Properties
+JavaBeanPropertiesSection_JavaType=Java Type:
+JavaBeanPropertiesSection_MappingType=Mapping Type \:
+JavaBeanPropertiesSection_SearchJavaType=Search Java Type
+JavaBeanPropertiesSection_TargetInstanceClass=Target instance class name \:
+JavaBeanPropertiesSection_TypeDialogErrorMessage=Unable to open type selection dialog
+# START NON-TRANSLATABLE
+JavaBeanPropertiesSection_TypePropertyName=type
+# END NON-TRANSLATABLE
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14579 - in trunk/seam: tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-04-07 18:13:49 -0400 (Tue, 07 Apr 2009)
New Revision: 14579
Added:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide3989Test.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
Log:
JBIDE-3989 Create a JUnit test case for JBIDE-3979
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2009-04-07 18:44:31 UTC (rev 14578)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2009-04-07 22:13:49 UTC (rev 14579)
@@ -64,7 +64,11 @@
Export-Package: org.jboss.tools.seam.ui,
org.jboss.tools.seam.ui.actions,
org.jboss.tools.seam.ui.builder,
+ org.jboss.tools.seam.ui.dialog,
+ org.jboss.tools.seam.ui.handlers,
org.jboss.tools.seam.ui.internal.project.facet;x-internal:=true,
+ org.jboss.tools.seam.ui.internal.reveng,
+ org.jboss.tools.seam.ui.marker,
org.jboss.tools.seam.ui.preferences,
org.jboss.tools.seam.ui.refactoring,
org.jboss.tools.seam.ui.search,
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2009-04-07 18:44:31 UTC (rev 14578)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2009-04-07 22:13:49 UTC (rev 14579)
@@ -18,17 +18,12 @@
import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistJbide1676Test;
import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistTest;
import org.jboss.tools.seam.ui.test.hyperlink.SeamViewHyperlinkPartitionerTest;
+import org.jboss.tools.seam.ui.test.jbide.JBide3989Test;
import org.jboss.tools.seam.ui.test.preferences.SeamPreferencesPageTest;
import org.jboss.tools.seam.ui.test.preferences.SeamSettingsPreferencesPageTest;
import org.jboss.tools.seam.ui.test.view.SeamComponentsViewAllTests;
import org.jboss.tools.seam.ui.test.wizard.OpenSeamComponentDialogTest;
import org.jboss.tools.seam.ui.test.wizard.PackageNamesTest;
-import org.jboss.tools.seam.ui.test.wizard.Seam12EARNewOperationTest;
-import org.jboss.tools.seam.ui.test.wizard.Seam12WARNewOperationTest;
-import org.jboss.tools.seam.ui.test.wizard.Seam12XOperationsTestSuite121EAP;
-import org.jboss.tools.seam.ui.test.wizard.Seam20EARNewOperationTest;
-import org.jboss.tools.seam.ui.test.wizard.Seam20WARNewOperationTest;
-import org.jboss.tools.seam.ui.test.wizard.Seam20XOperationsTestSuite201GA;
import org.jboss.tools.seam.ui.test.wizard.SeamActionNewWizardTest;
import org.jboss.tools.seam.ui.test.wizard.SeamFormNewWizardTest;
import org.jboss.tools.seam.ui.test.wizard.SeamProjectNewWizardTest;
@@ -57,6 +52,7 @@
suite.addTestSuite(SeamELContentAssistJbide1645Test.class);
suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamSettingsPreferencesPageTest.class), "org.jboss.tools.seam.ui.test", "projects/TestSeamSettingsPreferencesPage", "TestSeamSettingsPreferencesPage"));
suite.addTestSuite(PackageNamesTest.class);
+ suite.addTestSuite(JBide3989Test.class);
return suite;
}
}
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide3989Test.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide3989Test.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide3989Test.java 2009-04-07 22:13:49 UTC (rev 14579)
@@ -0,0 +1,96 @@
+/*************************************************************************************
+ * Copyright (c) 2008 JBoss, a division of Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * JBoss, a division of Red Hat - Initial implementation.
+ ************************************************************************************/
+package org.jboss.tools.seam.ui.test.jbide;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.ui.IMarkerResolution;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.wst.validation.internal.operations.ValidatorManager;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+import org.jboss.tools.seam.core.ISeamProject;
+import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.ui.marker.SeamRuntimeMarkerResolution;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ * @author snjeza
+ *
+ */
+public class JBide3989Test extends TestCase {
+
+ private IProject project;
+ private static final String PROJECT_NAME = "TestSeamELContentAssist";
+ private boolean makeCopy = true;
+
+ public static Test suite() {
+ return new TestSuite(JBide3989Test.class);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ TestProjectProvider provider = new TestProjectProvider(
+ "org.jboss.tools.seam.ui.test", null, PROJECT_NAME, makeCopy);
+ project = provider.getProject();
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ JobUtils.waitForIdle();
+ ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
+ seamProject.setRuntimeName("UNKNOWN");
+ ValidatorManager.addProjectBuildValidationSupport(project);
+ project.build(IncrementalProjectBuilder.CLEAN_BUILD,
+ new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ JobUtils.waitForIdle();
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ try {
+ project.delete(true, true, null);
+ } finally {
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+ }
+
+ public void testJBide3989() throws CoreException {
+ IMarker[] markers = project.findMarkers(IMarker.PROBLEM, true,
+ IResource.DEPTH_INFINITE);
+ boolean found = false;
+ for (int i = 0; i < markers.length; i++) {
+ IMarker marker = markers[i];
+ IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
+ .getResolutions(marker);
+ for (int j = 0; j < resolutions.length; j++) {
+ IMarkerResolution resolution = resolutions[j];
+ if (resolution instanceof SeamRuntimeMarkerResolution) {
+ found = true;
+ break;
+ }
+ }
+ if (found) {
+ break;
+ }
+ }
+ assertTrue("The quickfix \"Set Seam Properties\" doesn't exist.", found);
+ }
+
+}
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14578 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-04-07 14:44:31 -0400 (Tue, 07 Apr 2009)
New Revision: 14578
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1077
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-04-07 16:38:54 UTC (rev 14577)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-04-07 18:44:31 UTC (rev 14578)
@@ -10,9 +10,13 @@
******************************************************************************/
package org.jboss.tools.seam.internal.core.refactoring;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Set;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
@@ -25,6 +29,12 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner;
+import org.eclipse.jdt.ui.text.IJavaPartitions;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
import org.eclipse.ltk.core.refactoring.TextFileChange;
@@ -34,17 +44,46 @@
import org.eclipse.ltk.core.refactoring.participants.SharableParticipants;
import org.eclipse.text.edits.ReplaceEdit;
import org.eclipse.text.edits.TextEdit;
+import org.eclipse.wst.sse.core.StructuredModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
+import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
+import org.jboss.tools.common.el.core.model.ELInstance;
+import org.jboss.tools.common.el.core.model.ELInvocationExpression;
+import org.jboss.tools.common.el.core.model.ELModel;
+import org.jboss.tools.common.el.core.model.ELPropertyInvocation;
+import org.jboss.tools.common.el.core.parser.ELParser;
+import org.jboss.tools.common.el.core.parser.ELParserUtil;
+import org.jboss.tools.common.el.core.parser.SyntaxError;
+import org.jboss.tools.common.el.core.resolver.ElVarSearcher;
+import org.jboss.tools.common.el.core.resolver.Var;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamPreferences;
+import org.jboss.tools.seam.core.SeamProjectsSet;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* @author Alexey Kazakov
*/
public class RenameComponentProcessor extends RenameProcessor {
private static final String ANNOTATION_NAME = "org.jboss.seam.annotations.Name";
+ private static final String JAVA_EXT = "java";
+ private static final String XML_EXT = "xml";
+ private static final String XHTML_EXT = "xhtml";
+ private static final String JSP_EXT = "jsp";
+ private static final String PROPERTIES_EXT = "properties";
private IFile file;
private ISeamComponent component;
@@ -82,6 +121,8 @@
this.newName = componentName;
annotation = getAnnotation(file);
+
+ findReferences();
}
private IAnnotation getAnnotation(IFile file){
@@ -113,7 +154,189 @@
}
return null;
}
+
+ // we need to find references in .java .xml .xhtml .jsp .properties files
+ private void findReferences(){
+ SeamProjectsSet projectsSet = new SeamProjectsSet(file.getProject());
+
+ IProject warProject = projectsSet.getWarProject();
+ if(warProject != null)
+ scan(warProject);
+
+ IProject earProject = projectsSet.getEarProject();
+ if(earProject != null)
+ scan(earProject);
+
+ // TODO Here can be several ejb projects
+ IProject ejbProject = projectsSet.getEjbProject();
+ if(ejbProject != null)
+ scan(ejbProject);
+
+ }
+
+ private void scan(IProject project){
+ try{
+ for(IResource resource : project.members()){
+ if(resource instanceof IFolder)
+ scan((IFolder) resource);
+ else if(resource instanceof IFile)
+ scan((IFile) resource);
+ }
+ }catch(CoreException ex){
+ SeamCorePlugin.getDefault().logError(ex);
+ }
+ }
+
+ private void scan(IFolder folder){
+ System.out.println("Scan folder - "+folder.getName());
+ try{
+ for(IResource resource : folder.members()){
+ if(resource instanceof IFolder)
+ scan((IFolder) resource);
+ else if(resource instanceof IFile)
+ scan((IFile) resource);
+ }
+ }catch(CoreException ex){
+ SeamCorePlugin.getDefault().logError(ex);
+ }
+ }
+
+ private void scan(IFile file){
+ System.out.println("Scan file - "+file.getName());
+ String ext = file.getFileExtension();
+ String content = null;
+ try {
+ content = FileUtil.readStream(file.getContents());
+ } catch (CoreException e) {
+ SeamCorePlugin.getPluginLog().logError(e);
+ return;
+ }
+ if(ext.equalsIgnoreCase(JAVA_EXT))
+ scanJava(file, content);
+ else if(ext.equalsIgnoreCase(XML_EXT) || ext.equalsIgnoreCase(XHTML_EXT))
+ scanDOM(file, content);
+ else if(ext.equalsIgnoreCase(JSP_EXT))
+ scanJsp(file, content);
+ else if(ext.equalsIgnoreCase(PROPERTIES_EXT))
+ scanProperties(file, content);
+
+ }
+
+ private void scanJava(IFile file, String content){
+ try {
+ FastJavaPartitionScanner scaner = new FastJavaPartitionScanner();
+ Document document = new Document(content);
+ scaner.setRange(document, 0, document.getLength());
+ IToken token = scaner.nextToken();
+ while(token!=null && token!=Token.EOF) {
+ if(IJavaPartitions.JAVA_STRING.equals(token.getData())) {
+ int length = scaner.getTokenLength();
+ int offset = scaner.getTokenOffset();
+ String value = document.get(offset, length);
+ if(value.indexOf('{')>-1) {
+ scanString(file, value, offset);
+ }
+ }
+ token = scaner.nextToken();
+ }
+ } catch (BadLocationException e) {
+ SeamCorePlugin.getDefault().logError(e);
+ }
+ }
+
+ private void scanDOM(IFile file, String content){
+ varListForCurentValidatedNode.clear();
+ IModelManager manager = StructuredModelManager.getModelManager();
+ if(manager == null) {
+ return;
+ }
+ IStructuredModel model = null;
+ try {
+ model = manager.getModelForRead(file);
+ if (model instanceof IDOMModel) {
+ IDOMModel domModel = (IDOMModel) model;
+ IDOMDocument document = domModel.getDocument();
+ validateChildNodes(file, document);
+ }
+ } catch (CoreException e) {
+ SeamCorePlugin.getDefault().logError(e);
+ } catch (IOException e) {
+ SeamCorePlugin.getDefault().logError(e);
+ } finally {
+ if (model != null) {
+ model.releaseFromRead();
+ }
+ }
+ }
+ private List<Var> varListForCurentValidatedNode = new ArrayList<Var>();
+ private ElVarSearcher elVarSearcher;
+ private void validateChildNodes(IFile file, Node parent) {
+ String preferenceValue = SeamPreferences.getProjectPreference(file.getProject(), SeamPreferences.CHECK_VARS);
+ NodeList children = parent.getChildNodes();
+ for(int i=0; i<children.getLength(); i++) {
+ Node curentValidatedNode = children.item(i);
+ Var var = null;
+ if(Node.ELEMENT_NODE == curentValidatedNode.getNodeType()) {
+ if (SeamPreferences.ENABLE.equals(preferenceValue)) {
+ var = elVarSearcher.findVar(curentValidatedNode);
+ }
+ if(var!=null) {
+ varListForCurentValidatedNode.add(var);
+ }
+ validateNodeContent(file, ((IDOMNode)curentValidatedNode).getFirstStructuredDocumentRegion(), DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE);
+ } else if(Node.TEXT_NODE == curentValidatedNode.getNodeType()) {
+ validateNodeContent(file, ((IDOMNode)curentValidatedNode).getFirstStructuredDocumentRegion(), DOMRegionContext.XML_CONTENT);
+ }
+ validateChildNodes(file, curentValidatedNode);
+ if(var!=null) {
+ varListForCurentValidatedNode.remove(var);
+ }
+ }
+ }
+
+ private void validateNodeContent(IFile file, IStructuredDocumentRegion node, String regionType) {
+ ITextRegionList regions = node.getRegions();
+ for(int i=0; i<regions.size(); i++) {
+ ITextRegion region = regions.get(i);
+ if(region.getType() == regionType) {
+ String text = node.getFullText(region);
+ if(text.indexOf("{")>-1) { //$NON-NLS-1$
+ int offset = node.getStartOffset() + region.getStart();
+ scanString(file, text, offset);
+ }
+ }
+ }
+ }
+
+ private void scanString(IFile file, String string, int offset) {
+ System.out.println("Validate String - "+string);
+ int startEl = string.indexOf("#{"); //$NON-NLS-1$
+ if(startEl>-1) {
+ ELParser parser = ELParserUtil.getJbossFactory().createParser();
+ ELModel model = parser.parse(string);
+ for (ELInstance instance : model.getInstances()) {
+ for(ELInvocationExpression ie : instance.getExpression().getInvocations()){
+ if(ie instanceof ELPropertyInvocation){
+
+ }
+ }
+ }
+ }
+ }
+
+ private ELPropertyInvocation findComponent(ELInvocationExpression ie){
+ return null;
+ }
+
+ private void scanJsp(IFile file, String content){
+
+ }
+
+ private void scanProperties(IFile file, String content){
+
+ }
+
/*
* (non-Javadoc)
* @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#checkFinalConditions(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14577 - trunk/ws/docs/reference/en/images.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-04-07 12:38:54 -0400 (Tue, 07 Apr 2009)
New Revision: 14577
Removed:
trunk/ws/docs/reference/en/images/jbossws_bottomup.png
trunk/ws/docs/reference/en/images/jbossws_bottomup_1.png
trunk/ws/docs/reference/en/images/jbossws_bottomup_2.png
trunk/ws/docs/reference/en/images/jbossws_bottomup_3.png
trunk/ws/docs/reference/en/images/jbossws_bottomup_4.png
trunk/ws/docs/reference/en/images/jbossws_bottomup_5.png
trunk/ws/docs/reference/en/images/jbossws_bottomup_6.png
trunk/ws/docs/reference/en/images/jbossws_facet.png
trunk/ws/docs/reference/en/images/jbossws_newruntime.png
trunk/ws/docs/reference/en/images/jbossws_webproject_1.png
trunk/ws/docs/reference/en/images/jbossws_webproject_2.png
trunk/ws/docs/reference/en/images/jbossws_webproject_3.png
trunk/ws/docs/reference/en/images/jbossws_ws_Impl_code_view.png
trunk/ws/docs/reference/en/images/jbossws_ws_creation1.png
trunk/ws/docs/reference/en/images/jbossws_ws_creation1_1.png
trunk/ws/docs/reference/en/images/jbossws_ws_creation2.png
trunk/ws/docs/reference/en/images/jbossws_ws_webxml.png
Log:
screenshots are moved to the folder corresponding to the chapter
Deleted: trunk/ws/docs/reference/en/images/jbossws_bottomup.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_bottomup_1.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_bottomup_2.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_bottomup_3.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_bottomup_4.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_bottomup_5.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_bottomup_6.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_facet.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_newruntime.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_webproject_1.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_webproject_2.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_webproject_3.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_ws_Impl_code_view.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_ws_creation1.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_ws_creation1_1.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_ws_creation2.png
===================================================================
(Binary files differ)
Deleted: trunk/ws/docs/reference/en/images/jbossws_ws_webxml.png
===================================================================
(Binary files differ)
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14576 - in trunk/ws/docs/reference/en/images: topdown and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-04-07 12:37:53 -0400 (Tue, 07 Apr 2009)
New Revision: 14576
Added:
trunk/ws/docs/reference/en/images/topdown/
trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup.png
trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_1.png
trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_2.png
trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_3.png
trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_4.png
trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_5.png
trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_6.png
trunk/ws/docs/reference/en/images/topdown/jbossws_facet.png
trunk/ws/docs/reference/en/images/topdown/jbossws_newruntime.png
trunk/ws/docs/reference/en/images/topdown/jbossws_webproject_1.png
trunk/ws/docs/reference/en/images/topdown/jbossws_webproject_2.png
trunk/ws/docs/reference/en/images/topdown/jbossws_webproject_3.png
trunk/ws/docs/reference/en/images/topdown/jbossws_ws_Impl_code_view.png
trunk/ws/docs/reference/en/images/topdown/jbossws_ws_creation1.png
trunk/ws/docs/reference/en/images/topdown/jbossws_ws_creation1_1.png
trunk/ws/docs/reference/en/images/topdown/jbossws_ws_creation2.png
trunk/ws/docs/reference/en/images/topdown/jbossws_ws_webxml.png
Log:
schreenshots are moved to the folder corresponding to the chapter.
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_2.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_3.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_4.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_5.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_6.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_bottomup_6.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_facet.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_facet.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_newruntime.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_newruntime.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_webproject_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_webproject_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_webproject_2.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_webproject_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_webproject_3.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_webproject_3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_ws_Impl_code_view.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_ws_Impl_code_view.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_ws_creation1.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_ws_creation1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_ws_creation1_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_ws_creation1_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_ws_creation2.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_ws_creation2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ws/docs/reference/en/images/topdown/jbossws_ws_webxml.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/docs/reference/en/images/topdown/jbossws_ws_webxml.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14575 - trunk/ws/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-04-07 12:36:38 -0400 (Tue, 07 Apr 2009)
New Revision: 14575
Modified:
trunk/ws/docs/reference/en/modules/topdown.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-398 - screenshots are moved to the corresponding folder, reflected in the doc.
Modified: trunk/ws/docs/reference/en/modules/topdown.xml
===================================================================
--- trunk/ws/docs/reference/en/modules/topdown.xml 2009-04-07 16:21:42 UTC (rev 14574)
+++ trunk/ws/docs/reference/en/modules/topdown.xml 2009-04-07 16:36:38 UTC (rev 14575)
@@ -21,7 +21,7 @@
<title>Dynamic Web Project</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_webproject_1.png"/>
+ <imagedata fileref="images/topdown/jbossws_webproject_1.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -44,7 +44,7 @@
<title>Dynamic Web Project Wizard</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_webproject_2.png"/>
+ <imagedata fileref="images/topdown/jbossws_webproject_2.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -55,7 +55,7 @@
<title>Web Module Settings Configuration</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_webproject_3.png"/>
+ <imagedata fileref="images/topdown/jbossws_webproject_3.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -72,7 +72,7 @@
<title>Configure JBoss Web Service Facet</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_facet.png"/>
+ <imagedata fileref="images/topdown/jbossws_facet.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -92,7 +92,7 @@
<title>Configure JBossWS Runtime</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_newruntime.png"/>
+ <imagedata fileref="images/topdown/jbossws_newruntime.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -118,7 +118,7 @@
<title>New Web Service Wizard</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_ws_creation1.png"/>
+ <imagedata fileref="images/topdown/jbossws_ws_creation1.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -130,7 +130,7 @@
<title>Select Server and Web Service runtime</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_ws_creation1_1.png"/>
+ <imagedata fileref="images/topdown/jbossws_ws_creation1_1.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -143,7 +143,7 @@
<title>New Web Service Wizard</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_ws_creation1.png"/>
+ <imagedata fileref="images/topdown/jbossws_ws_creation1.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -155,7 +155,7 @@
<title>New Web Service Wizard</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_ws_creation2.png"/>
+ <imagedata fileref="images/topdown/jbossws_ws_creation2.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -180,7 +180,7 @@
<title>The generated implementation Java code</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_ws_Impl_code_view.png"/>
+ <imagedata fileref="images/topdown/jbossws_ws_Impl_code_view.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -189,7 +189,7 @@
<title>Web.xml</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_ws_webxml.png"/>
+ <imagedata fileref="images/topdown/jbossws_ws_webxml.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -218,7 +218,7 @@
<title>Create a new Bean Class</title>
<mediaobject>
<imageobject>
- <imagedata scale="80" fileref="images/jbossws_bottomup.png"/>
+ <imagedata scale="80" fileref="images/topdown/jbossws_bottomup.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -232,7 +232,7 @@
<title>New Web Service</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_bottomup_1.png"/>
+ <imagedata fileref="images/topdown/jbossws_bottomup_1.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -245,7 +245,7 @@
<title>Set Web Service Common values</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_bottomup_2.png"/>
+ <imagedata fileref="images/topdown/jbossws_bottomup_2.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -313,7 +313,7 @@
<title>Set Web Service values for Code Generation</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_bottomup_3.png"/>
+ <imagedata fileref="images/topdown/jbossws_bottomup_3.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -340,7 +340,7 @@
<title>Start a Server</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/jbossws_bottomup_4.png"/>
+ <imagedata fileref="images/topdown/jbossws_bottomup_4.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -358,7 +358,7 @@
<title>The generated WSDL file</title>
<mediaobject>
<imageobject>
- <imagedata scale="80" fileref="images/jbossws_bottomup_6.png"/>
+ <imagedata scale="80" fileref="images/topdown/jbossws_bottomup_6.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -371,7 +371,7 @@
<title>The Updated web.xml file</title>
<mediaobject>
<imageobject>
- <imagedata scale="80" fileref="images/jbossws_bottomup_5.png"/>
+ <imagedata scale="80" fileref="images/topdown/jbossws_bottomup_5.png"/>
</imageobject>
</mediaobject>
</figure>
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14574 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4037 and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2009-04-07 12:21:42 -0400 (Tue, 07 Apr 2009)
New Revision: 14574
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4037/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4037/4037.html
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4037Test.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
RESOLVED - issue JBIDE-4037: Visual part of VPE doesn't display/select automatically currently selected item from search results
https://jira.jboss.org/jira/browse/JBIDE-4037
- the issue is resolved
- JUnit test is added
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4037/4037.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4037/4037.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4037/4037.html 2009-04-07 16:21:42 UTC (rev 14574)
@@ -0,0 +1 @@
+<div id="rootElement"><span>text1</span><span>text2</span></div>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-04-07 16:19:35 UTC (rev 14573)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-04-07 16:21:42 UTC (rev 14574)
@@ -53,6 +53,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3632Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3650Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3734Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4037Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test;
@@ -83,6 +84,7 @@
// $JUnit-BEGIN$
suite.addTestSuite(JsfComponentTest.class);
suite.addTestSuite(Jsf20ComponentContentTest.class);
+ suite.addTestSuite(JBIDE4037Test.class);
suite.addTestSuite(JBIDE3734Test.class);
suite.addTestSuite(JBIDE3617Test.class);
suite.addTestSuite(JBIDE3473Test.class);
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4037Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4037Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4037Test.java 2009-04-07 16:21:42 UTC (rev 14574)
@@ -0,0 +1,57 @@
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMElement;
+
+/**
+ * Test of <a href="https://jira.jboss.org/jira/browse/JBIDE-4037">JBIDE-4037</a>:
+ * Visual part of VPE doesn't display/select
+ * automatically currently selected item from search results.
+ *
+ * @author yradtsevich
+ *
+ */
+public class JBIDE4037Test extends VpeTest {
+
+ private static final String ROOT_ELEMENT_ID = "rootElement"; //$NON-NLS-1$
+ private static final String FILE_PATH = "JBIDE/4037/4037.html"; //$NON-NLS-1$
+
+ public JBIDE4037Test(String name) {
+ super(name);
+ }
+
+ /**
+ * Checks if the first element in the test file is selected in the VPE
+ * when the VPE is just loaded.
+ *
+ * @throws Throwable
+ */
+ public void testJBIDE4037Test() throws Throwable {
+ setException(null);
+ IFile ifile = (IFile) TestUtil.getComponentPath(FILE_PATH,
+ JsfAllTests.IMPORT_PROJECT_NAME);
+ IEditorInput input = new FileEditorInput(ifile);
+ JSPMultiPageEditor part = openEditor(input);
+
+ TestUtil.waitForJobs();
+ nsIDOMElement rootElement = TestUtil.getVpeController(part)
+ .getXulRunnerEditor()
+ .getLastSelectedElement();
+
+ //check if something selected
+ assertNotNull(rootElement);
+ //check if the selected element is the first element on the page (we know its ID)
+ assertEquals(ROOT_ELEMENT_ID, rootElement.getAttribute(HTML.ATTR_ID));
+
+ if(getException()!=null) {
+ throw getException();
+ }
+ }
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-04-07 16:19:35 UTC (rev 14573)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-04-07 16:21:42 UTC (rev 14574)
@@ -10,8 +10,6 @@
******************************************************************************/
package org.jboss.tools.vpe.editor;
-import java.io.File;
-import java.net.MalformedURLException;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -346,6 +344,9 @@
//initialization of vpe update delay time
vpeUpdateDelayTime = 400;
// pageContext.fireTaglibsChanged();
+
+ // yradtsevich: we have to refresh VPE selection on init (fix of JBIDE-4037)
+ sourceSelectionChanged(true);
}
public void dispose() {
@@ -1986,27 +1987,22 @@
.getInnerDropInfo(event);
if (visualDropInfo.getDropContainer() != null) {
if (VpeDebug.PRINT_VISUAL_INNER_DRAGDROP_EVENT) {
- System.out
- .print(" x: " + visualDropInfo.getMouseX() + " y: " + visualDropInfo.getMouseY() + //$NON-NLS-1$ //$NON-NLS-2$
- " container: "
- + visualDropInfo.getDropContainer()
- .getNodeName()
- + //$NON-NLS-1$
- "("
- + visualDropInfo.getDropContainer()
- + ")" + //$NON-NLS-1$ //$NON-NLS-2$
- " parent: "
- + visualDropInfo.getDropContainer()
- .getParentNode().getNodeName()
- + //$NON-NLS-1$
- "("
- + visualDropInfo.getDropContainer()
- .getParentNode() + ")" + //$NON-NLS-1$ //$NON-NLS-2$
- " offset: "
- + visualDropInfo.getDropOffset()); //$NON-NLS-1$
+ System.out.print(" x: " + visualDropInfo.getMouseX()
+ + " y: " //$NON-NLS-1$
+ + visualDropInfo.getMouseY()
+ + " container: " //$NON-NLS-1$
+ + visualDropInfo.getDropContainer().getNodeName()
+ + "(" //$NON-NLS-1$
+ + visualDropInfo.getDropContainer()
+ + ") parent: " //$NON-NLS-1$
+ + visualDropInfo.getDropContainer().getParentNode().getNodeName()
+ + "(" //$NON-NLS-1$
+ + visualDropInfo.getDropContainer().getParentNode()
+ + ") offset: " //$NON-NLS-1$
+ + visualDropInfo.getDropOffset());
}
- VpeSourceInnerDragInfo sourceInnerDragInfo = visualBuilder
- .getSourceInnerDragInfo(innerDragInfo);
+ VpeSourceInnerDragInfo sourceInnerDragInfo =
+ visualBuilder.getSourceInnerDragInfo(innerDragInfo);
VpeSourceInnerDropInfo sourceDropInfo = visualBuilder
.getSourceInnerDropInfo(sourceInnerDragInfo.getNode(),
visualDropInfo, true);
@@ -2493,15 +2489,13 @@
toolbarFormatControllerManager.selectionChanged();
}
- if (!switcher
- .startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_SOURCE)) {
+ if (!switcher.startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_SOURCE)) {
return;
}
try {
if (VpeDebug.PRINT_SOURCE_SELECTION_EVENT) {
- System.out
- .println(">>>>>>>>>>>>>> selectionChanged " + event.getSource()); //$NON-NLS-1$
+ System.out.println(">>>>>>>>>>>>>> selectionChanged " + event.getSource()); //$NON-NLS-1$
}
sourceSelectionChanged();
} finally {
@@ -2510,8 +2504,7 @@
}
// nsIClipboardDragDropHooks implementation
- public void onPasteOrDrop(nsIDOMMouseEvent mouseEvent, String flavor,
- String data) {
+ public void onPasteOrDrop(nsIDOMMouseEvent mouseEvent, String flavor, String data) {
onHideTooltip();
VpeVisualInnerDropInfo visualDropInfo = selectionBuilder
@@ -2537,8 +2530,7 @@
if (visualDropInfo.getDropContainer() != null) {
if (VpeDebug.PRINT_VISUAL_INNER_DRAGDROP_EVENT) {
- System.out
- .println(" drop! container: " + visualDropInfo.getDropContainer().getNodeName()); //$NON-NLS-1$
+ System.out.println(" drop! container: " + visualDropInfo.getDropContainer().getNodeName()); //$NON-NLS-1$
}
final String finalFlavor = flavor;
final String finalData = data;
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14573 - trunk/ws/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-04-07 12:19:35 -0400 (Tue, 07 Apr 2009)
New Revision: 14573
Removed:
trunk/ws/docs/reference/en/modules/webproject.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-398 - the structure of the xml documents set revised, the unnecessary one removed
Deleted: trunk/ws/docs/reference/en/modules/webproject.xml
===================================================================
--- trunk/ws/docs/reference/en/modules/webproject.xml 2009-04-07 15:52:30 UTC (rev 14572)
+++ trunk/ws/docs/reference/en/modules/webproject.xml 2009-04-07 16:19:35 UTC (rev 14573)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="webproject" revisionflag="added">
- <title>Creating a Dynamic Web project</title>
-
- <para>Before creating a web service, you should have a Dynamic Web Project created:</para>
- <figure>
- <title>Dynamic Web Project</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/webproject1.png"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
- <para>Create a Web project by selecting
- <emphasis><property>New > Project... > Dynamic Web project</property></emphasis>. Enter the following information: </para>
- <itemizedlist>
- <listitem>
- <para>Project Name: enter a project name</para>
- </listitem>
- <listitem>
- <para>Target runtime: any server depending on your installation. If it is not listed, click New and browse to the location where it is installed to. You may set <emphasis><property>Target Runtime</property></emphasis> to <emphasis><property>None</property></emphasis>,
- in this case, you should add <link linkend="addfacet">JBoss Web Service facet to the project</link>.</para>
- <figure>
- <title>Dynamic Web Project Wizard</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/webproject2.png"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
- </listitem>
- <listitem>
- <para>Configure Web Module values:</para>
- <figure>
- <title> Web Module Settings Configuration</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/webproject3.png"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
- </listitem>
- </itemizedlist>
- <para>Click on the <property>Finish</property> button.</para>
-</chapter>
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14572 - trunk/ws/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-04-07 11:52:30 -0400 (Tue, 07 Apr 2009)
New Revision: 14572
Modified:
trunk/ws/docs/reference/en/modules/overview.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-398 - introductory part updated
Modified: trunk/ws/docs/reference/en/modules/overview.xml
===================================================================
--- trunk/ws/docs/reference/en/modules/overview.xml 2009-04-07 14:47:44 UTC (rev 14571)
+++ trunk/ws/docs/reference/en/modules/overview.xml 2009-04-07 15:52:30 UTC (rev 14572)
@@ -3,5 +3,5 @@
<title>JBossWS Runtime Overview</title>
<para>JBossWS is a web service framework developed as a part of the JBoss Application Server. It implements the JAX-WS specification that defines a programming model and run-time architecture for implementing web services in Java, targeted at the Java Platform, Enterprise Edition 5 (Java EE 5).</para>
-
+ <para>JBossWS integrates with most current JBoss Application Server releases as well as earlier ones, that did implement the J2EE 1.4 specifications. Even though JAX-RPC, the web service specification for J2EE 1.4, is still supported JBossWS does put a clear focus on JAX-WS.</para>
</chapter>
\ No newline at end of file
15 years, 8 months
- 1
- 0