summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-02-01 02:53:24 (EST)
committer Stephan Born2012-04-24 04:29:59 (EDT)
commit74bf5d8505b89b8240d6000d12eeec622c8102e2 (patch)
tree549eb5fe7b1b34792c7e1728c17d191dfe50b834
parenta5d0f9ce4c772ffdee174c87870a805850056e95 (diff)
downloadorg.eclipse.stardust.ide-74bf5d8505b89b8240d6000d12eeec622c8102e2.zip
org.eclipse.stardust.ide-74bf5d8505b89b8240d6000d12eeec622c8102e2.tar.gz
org.eclipse.stardust.ide-74bf5d8505b89b8240d6000d12eeec622c8102e2.tar.bz2
Jira-ID: CRNT-22383 Merge changes done on b_dev_6_0_x after 6.0.2.GA (6.0.2.2-r49368) through 6.0.3.GA (6.0.3.6-r50668) and beyond (6.0.x HEAD) to 7.0 (trunk) - moonglow / simulation / tate / tds (org.eclipse.stardust.modeling.integration.webservices)
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@53287 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSOutlineSynchronizer.java6
-rw-r--r--modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSPartsPropertyPage.java16
-rw-r--r--modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSPropertyPage.java21
-rw-r--r--modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSResource.java4
-rw-r--r--modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSUtil.java2
-rw-r--r--modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/QNameLabelProvider.java6
-rw-r--r--modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/Webservices_Messages.java3
-rw-r--r--modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/webservices-messages.properties5
8 files changed, 35 insertions, 28 deletions
diff --git a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSOutlineSynchronizer.java b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSOutlineSynchronizer.java
index 0f29487..6e52c76 100644
--- a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSOutlineSynchronizer.java
+++ b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSOutlineSynchronizer.java
@@ -180,12 +180,12 @@ public class JaxWSOutlineSynchronizer
}
Operation op = operation.getOperation();
- checkMappings(op.getInput() == null ? null : op.getInput().getMessage(), "input", DirectionType.IN_LITERAL);
- checkMappings(op.getOutput() == null ? null : op.getOutput().getMessage(), "output", DirectionType.OUT_LITERAL);
+ checkMappings(op.getInput() == null ? null : op.getInput().getMessage(), "input", DirectionType.IN_LITERAL); //$NON-NLS-1$
+ checkMappings(op.getOutput() == null ? null : op.getOutput().getMessage(), "output", DirectionType.OUT_LITERAL); //$NON-NLS-1$
for (Iterator<Fault> i = op.getFaults().values().iterator(); i.hasNext();)
{
Fault fault = i.next();
- checkMappings(fault.getMessage(), "fault:" + fault.getName(), DirectionType.OUT_LITERAL);
+ checkMappings(fault.getMessage(), "fault:" + fault.getName(), DirectionType.OUT_LITERAL); //$NON-NLS-1$
}
for (Iterator<Part> i = xmlParts.iterator(); i.hasNext();)
diff --git a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSPartsPropertyPage.java b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSPartsPropertyPage.java
index eb00794..8e19624 100644
--- a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSPartsPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSPartsPropertyPage.java
@@ -192,7 +192,7 @@ public class JaxWSPartsPropertyPage extends
{
((GridLayout) parent.getLayout()).numColumns++;
Button button = new Button(parent, SWT.PUSH);
- button.setText("Generate classes...");
+ button.setText(Webservices_Messages.WebServicePropertyPage_Generate_Classes);
setButtonLayoutData(button);
button.addSelectionListener(new SelectionListener()
{
@@ -317,7 +317,7 @@ public class JaxWSPartsPropertyPage extends
private String toJavaClassName(String localPart)
{
- return localPart.substring(0, 1).toUpperCase() + localPart.substring(1) + ".java";
+ return localPart.substring(0, 1).toUpperCase() + localPart.substring(1) + ".java"; //$NON-NLS-1$
}
@SuppressWarnings("unchecked")
@@ -329,7 +329,7 @@ public class JaxWSPartsPropertyPage extends
for (int i = 0; i < fragments.length; i++)
{
ICompilationUnit unit = ((IPackageFragment) fragments[i])
- .getCompilationUnit("package-info.java");
+ .getCompilationUnit("package-info.java"); //$NON-NLS-1$
if (unit.exists())
{
NormalAnnotation annotation = (NormalAnnotation) JaxWSASTVisitor.getAnnotation(unit, XmlSchema.class);
@@ -338,7 +338,7 @@ public class JaxWSPartsPropertyPage extends
List<MemberValuePair> values = annotation.values();
for (MemberValuePair valuePair : values)
{
- if ("namespace".equals(valuePair.getName().toString()))
+ if ("namespace".equals(valuePair.getName().toString())) //$NON-NLS-1$
{
ns2pkgs.put(unquote(valuePair.getValue().toString()), (IPackageFragment) fragments[i]);
break;
@@ -376,10 +376,10 @@ public class JaxWSPartsPropertyPage extends
String wsdlLocation = getSynchronizer().getWsdlLocation();
String[] args = new String[] {
- "-d", location,
- "-keep",
- "-Xnocompile",
- "-extension",
+ "-d", location, //$NON-NLS-1$
+ "-keep", //$NON-NLS-1$
+ "-Xnocompile", //$NON-NLS-1$
+ "-extension", //$NON-NLS-1$
wsdlLocation
};
diff --git a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSPropertyPage.java b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSPropertyPage.java
index d61af64..642cb34 100644
--- a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSPropertyPage.java
@@ -76,7 +76,6 @@ import org.eclipse.stardust.modeling.common.platform.validation.IQuickValidation
import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder;
import org.eclipse.stardust.modeling.common.ui.jface.utils.LabeledText;
import org.eclipse.stardust.modeling.common.ui.jface.widgets.LabelWithStatus;
-import org.eclipse.stardust.modeling.core.Diagram_Messages;
import org.eclipse.stardust.modeling.core.properties.AbstractModelElementPropertyPage;
import org.eclipse.stardust.modeling.repository.common.Connection;
import org.eclipse.stardust.modeling.repository.common.ConnectionHandler;
@@ -939,13 +938,15 @@ public class JaxWSPropertyPage extends AbstractModelElementPropertyPage
XmlUtils.class.getClassLoader(), project, resource));
String[] buttons = new String[] {IDialogConstants.CANCEL_LABEL };
dialog = new MessageDialog(Display.getDefault().getActiveShell(),
- "WSDL", null, "Retrieving WSDL....",
- MessageDialog.INFORMATION, buttons, 0) {
- protected void buttonPressed(int buttonId)
- {
- threadMap.put(currentLoader, true);
- super.buttonPressed(buttonId);
- }
+ Webservices_Messages.WebServicePropertyPage_WSDL, null,
+ Webservices_Messages.WebServicePropertyPage_Retrieving_WSDL,
+ MessageDialog.INFORMATION, buttons, 0)
+ {
+ protected void buttonPressed(int buttonId)
+ {
+ threadMap.put(currentLoader, true);
+ super.buttonPressed(buttonId);
+ }
};
currentLoader = new WSDLLoader(resource);
threadMap.put(currentLoader, false);
@@ -1152,7 +1153,7 @@ public class JaxWSPropertyPage extends AbstractModelElementPropertyPage
IProject project = ModelUtils.getProjectFromEObject(getApplication());
String resource = wsdlText.getText().getText().trim();
ProjectClassLoader cl = new ProjectClassLoader(
- XmlUtils.class.getClassLoader(), project, resource.startsWith("/")
+ XmlUtils.class.getClassLoader(), project, resource.startsWith("/") //$NON-NLS-1$
? resource.substring(1) : resource);
URL url = cl.getResource(resource);
return url == null ? resource : url.toString();
@@ -1197,7 +1198,7 @@ public class JaxWSPropertyPage extends AbstractModelElementPropertyPage
public void run()
{
String message = e.getMessage() == null ? e.toString() : e.getMessage();
- ErrorDialog.openError(null, Diagram_Messages.ERR_Error, Diagram_Messages.ERR_CannotLoadWSDLFile,
+ ErrorDialog.openError(null, "", "", //$NON-NLS-1$ //$NON-NLS-2$
new Status(Status.WARNING, CarnotConstants.DIAGRAM_PLUGIN_ID, 1, message, e));
}
});
diff --git a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSResource.java b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSResource.java
index fb89286..46e7051 100644
--- a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSResource.java
+++ b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSResource.java
@@ -75,8 +75,8 @@ public class JaxWSResource
jaxbDefaultMappings.put("boolean", Boolean.class.getName()); //$NON-NLS-1$
jaxbDefaultMappings.put("byte", Byte.class.getName()); //$NON-NLS-1$
jaxbDefaultMappings.put("QName", QName.class.getName()); //$NON-NLS-1$
- jaxbDefaultMappings.put("base64Binary", byte.class.getName() + "[]"); //$NON-NLS-1$
- jaxbDefaultMappings.put("hexBinary", byte.class.getName() + "[]"); //$NON-NLS-1$
+ jaxbDefaultMappings.put("base64Binary", byte.class.getName() + "[]"); //$NON-NLS-1$ //$NON-NLS-2$
+ jaxbDefaultMappings.put("hexBinary", byte.class.getName() + "[]"); //$NON-NLS-1$ //$NON-NLS-2$
// optional types
jaxbDefaultMappings.put("unsignedInt", Long.class.getName()); //$NON-NLS-1$
jaxbDefaultMappings.put("unsignedShort", Integer.class.getName()); //$NON-NLS-1$
diff --git a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSUtil.java b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSUtil.java
index 188e63b..853356d 100644
--- a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSUtil.java
+++ b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/JaxWSUtil.java
@@ -154,7 +154,7 @@ public final class JaxWSUtil
}
AccessPointType ap = null;
- String name = id+" ("+typeDeclaration.getName()+")";
+ String name = id+" ("+typeDeclaration.getName()+")"; //$NON-NLS-1$ //$NON-NLS-2$
DataTypeType dataType = ModelUtils.getDataType(application, StructuredDataConstants.STRUCTURED_DATA);
if (rawAccessPoints != null)
{
diff --git a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/QNameLabelProvider.java b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/QNameLabelProvider.java
index 735ef52..2ed41c6 100644
--- a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/QNameLabelProvider.java
+++ b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/QNameLabelProvider.java
@@ -72,18 +72,18 @@ public class QNameLabelProvider extends LabelProvider
}
else
{
- return name + "(:none," + outputName + ")";
+ return name + "(:none," + outputName + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
else
{
if (outputName == null)
{
- return name + "(" + inputName + ",:none)";
+ return name + "(" + inputName + ",:none)"; //$NON-NLS-1$ //$NON-NLS-2$
}
else
{
- return name + "(" + inputName + "," + outputName + ")";
+ return name + "(" + inputName + "," + outputName + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
}
diff --git a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/Webservices_Messages.java b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/Webservices_Messages.java
index 99242a1..197123e 100644
--- a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/Webservices_Messages.java
+++ b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/Webservices_Messages.java
@@ -79,4 +79,7 @@ public class Webservices_Messages extends NLS
public static String WebServicePropertyPage_UnknownPartValidationError;
public static String WebServicePropertyPage_TypeNotFoundForInputPart;
public static String WebServicePropertyPage_TypeNotFoundForOutputPart;
+ public static String WebServicePropertyPage_WSDL;
+ public static String WebServicePropertyPage_Generate_Classes;
+ public static String WebServicePropertyPage_Retrieving_WSDL;
}
diff --git a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/webservices-messages.properties b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/webservices-messages.properties
index af49812..9ac8d1f 100644
--- a/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/webservices-messages.properties
+++ b/modeling/org.eclipse.stardust.modeling.integration.webservices/src/org/eclipse/stardust/modeling/integration/webservices/webservices-messages.properties
@@ -61,4 +61,7 @@ WebServicePropertyPage_ServiceLabel=Service:
WebServicePropertyPage_VariantLabel=Variant:
WebServicePropertyPage_UnknownPartValidationError=Unknown validation error
WebServicePropertyPage_TypeNotFoundForInputPart=Could not find structured type for input message part {0}
-WebServicePropertyPage_TypeNotFoundForOutputPart=Could not find structured type for output message part {0} \ No newline at end of file
+WebServicePropertyPage_TypeNotFoundForOutputPart=Could not find structured type for output message part {0}
+WebServicePropertyPage_WSDL=WSDL
+WebServicePropertyPage_Retrieving_WSDL=Retrieving WSDL....
+WebServicePropertyPage_Generate_Classes=Generate classes... \ No newline at end of file