JBoss Tools SVN: r11567 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: java2xml/analyzer and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-06 04:42:08 -0500 (Thu, 06 Nov 2008)
New Revision: 11567
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/messages.properties
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/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/messages.properties
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java
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/javabean/analyzer/JavaBeanAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaModelConnectionResolveCommand.java
Log:
JBIDE-3129
Externalize String
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingModel.java 2008-11-06 09:36:12 UTC (rev 11566)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingModel.java 2008-11-06 09:42:08 UTC (rev 11567)
@@ -40,13 +40,13 @@
public String toString(){
StringBuffer buffer = new StringBuffer();
if(source != null)
- buffer.append("Source : " + source);
+ buffer.append(Messages.getString("MappingModel.Source") + source); //$NON-NLS-1$
else
- buffer.append("Source is NULL ");
+ buffer.append(Messages.getString("MappingModel.SourceIsNull")); //$NON-NLS-1$
if(target != null)
- buffer.append(";Target : " + target);
+ buffer.append(Messages.getString("MappingModel.Target") + target); //$NON-NLS-1$
else
- buffer.append(";Target is NULL ");
+ buffer.append(Messages.getString("MappingModel.TargetIsNull")); //$NON-NLS-1$
return buffer.toString();
}
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/Messages.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/Messages.java 2008-11-06 09:42:08 UTC (rev 11567)
@@ -0,0 +1,22 @@
+package org.jboss.tools.smooks.analyzer;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages {
+ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.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 + '!';
+ }
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/Messages.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java 2008-11-06 09:36:12 UTC (rev 11566)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java 2008-11-06 09:42:08 UTC (rev 11567)
@@ -60,13 +60,13 @@
if (analyzer == null) {
throw new SmooksAnalyzerException(
- "can't find the Analyzer for sourceID : "
+ Messages.getString("SmooksFileBuilder.NullAnalyzer1") //$NON-NLS-1$
+ context.getSourceDataTypeID()
- + " and the targetID : "
+ + Messages.getString("SmooksFileBuilder.NullAnalyzer2") //$NON-NLS-1$
+ context.getTargetDataTypeID());
}
if (smooksResource == null) {
- throw new SmooksAnalyzerException("SmooksResource is NULL");
+ throw new SmooksAnalyzerException(Messages.getString("SmooksFileBuilder.ResourceIsNull")); //$NON-NLS-1$
}
DocumentRoot documentRoot = (DocumentRoot) smooksResource.getContents()
.get(0);
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/messages.properties (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/messages.properties 2008-11-06 09:42:08 UTC (rev 11567)
@@ -0,0 +1,7 @@
+MappingModel.Source=Source :
+MappingModel.SourceIsNull=Source is NULL
+MappingModel.Target=;Target :
+MappingModel.TargetIsNull=;Target is NULL
+SmooksFileBuilder.NullAnalyzer1=Can't find the Analyzer for SourceID :
+SmooksFileBuilder.NullAnalyzer2=\ and the TargetID :
+SmooksFileBuilder.ResourceIsNull=SmooksResource is NULL
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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 2008-11-06 09:36:12 UTC (rev 11566)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java 2008-11-06 09:42:08 UTC (rev 11567)
@@ -58,7 +58,7 @@
// TODO will modify soon
if(true){
Shell shell = context.getShell();
- MessageDialog.openWarning(shell, "Warning", "The java2xml can't be generate to config file currently.");
+ MessageDialog.openWarning(shell, Messages.getString("Java2XMLAnalyzer.Warning"), Messages.getString("Java2XMLAnalyzer.CantGenerateConfig")); //$NON-NLS-1$ //$NON-NLS-2$
return;
}
@@ -77,7 +77,7 @@
}
if (root == null)
- throw new SmooksAnalyzerException("can't find the root element");
+ throw new SmooksAnalyzerException(Messages.getString("Java2XMLAnalyzer.CantFindRoot")); //$NON-NLS-1$
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("The Smooks editor doesn't support to parse the Java2XML config file currently.");
+ throw new RuntimeException(Messages.getString("Java2XMLAnalyzer.DontSupportJ2X")); //$NON-NLS-1$
}
protected String getTheJavaBeanString(JavaBeanModel currentModel) {
@@ -165,11 +165,11 @@
while (parent != null ) {
String pn = parent.getName();
if (pn != null) {
- name = parent.getName() + "." + name;
+ name = parent.getName() + "." + name; //$NON-NLS-1$
}
parent = parent.getParent();
}
- return "${" + name + "}";
+ return "${" + name + "}"; //$NON-NLS-1$ //$NON-NLS-2$
}
public DesignTimeAnalyzeResult[] analyzeGraphModel(
Added: 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 (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Messages.java 2008-11-06 09:42:08 UTC (rev 11567)
@@ -0,0 +1,22 @@
+package org.jboss.tools.smooks.java2xml.analyzer;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages {
+ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.java2xml.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 + '!';
+ }
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Messages.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/messages.properties 2008-11-06 09:42:08 UTC (rev 11567)
@@ -0,0 +1,4 @@
+Java2XMLAnalyzer.CantFindRoot=can't find the root element
+Java2XMLAnalyzer.CantGenerateConfig=The java2xml can't be generate to config file currently.
+Java2XMLAnalyzer.DontSupportJ2X=The Smooks editor doesn't support to parse the Java2XML config file currently.
+Java2XMLAnalyzer.Warning=Warning
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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 2008-11-06 09:36:12 UTC (rev 11566)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-06 09:42:08 UTC (rev 11567)
@@ -72,14 +72,18 @@
public class JavaBeanAnalyzer implements IMappingAnalyzer,
ISourceModelAnalyzer, ITargetModelAnalyzer {
- public static final String BEANPOPULATOR = "org.milyn.javabean.BeanPopulator";
+ public static final String BEANPOPULATOR = "org.milyn.javabean.BeanPopulator"; //$NON-NLS-1$
- public static final String PRO_CLASS_NAME = "__pro_class_name_";
+ public static final String PRO_CLASS_NAME = "__pro_class_name_"; //$NON-NLS-1$
- public static final Object PRO_PROJECT_NAME = "__pro_project_name_";
+ public static final Object PRO_PROJECT_NAME = "__pro_project_name_"; //$NON-NLS-1$
- public static final String SPACE_STRING = " ";
+ public static final String SPACE_STRING = " "; //$NON-NLS-1$
+ public static final String COMPLEX_PRIX_START = "${"; //$NON-NLS-1$
+
+ public static final String COMPLEX_PRIX_END = "}"; //$NON-NLS-1$
+
private static final int TARGET_DATA = 1;
private static final int SOURCE_DATA = 0;
@@ -205,11 +209,11 @@
ParamType beanIdParam = SmooksFactory.eINSTANCE
.createParamType();
- beanIdParam.setName("beanId");
+ beanIdParam.setName(SmooksModelUtils.BEAN_ID);
if (beanId == null)
beanId = targetJavaBean.getName();
- if (beanId.startsWith("${")) {
- beanId = beanId.substring(2, beanId.indexOf("}"));
+ if (beanId.startsWith(COMPLEX_PRIX_START)) {
+ beanId = beanId.substring(2, beanId.indexOf(COMPLEX_PRIX_END));
}
SmooksModelUtils
.appendTextToSmooksType(beanIdParam, beanId);
@@ -217,14 +221,14 @@
ParamType beanClassParam = SmooksFactory.eINSTANCE
.createParamType();
- beanClassParam.setName("beanClass");
+ beanClassParam.setName(SmooksModelUtils.BEAN_CLASS);
SmooksModelUtils.appendTextToSmooksType(beanClassParam,
targetJavaBean.getBeanClassString());
resourceConfig.getParam().add(beanClassParam);
ParamType bindingsParam = SmooksFactory.eINSTANCE
.createParamType();
- bindingsParam.setName("bindings");
+ bindingsParam.setName(SmooksModelUtils.BINDINGS);
resourceConfig.getParam().add(bindingsParam);
// to dispatch the target's children (Order processing)
@@ -267,7 +271,7 @@
currentSelectorName, null, null);
UIUtils.assignConnectionPropertyToBinding(
childConnection, binding, new String[] {
- "property", "selector" });
+ "property", "selector" }); //$NON-NLS-1$ //$NON-NLS-2$
if (!jbean.isPrimitive()) {
analyzeStructuredDataModel(
resourceList,
@@ -304,9 +308,9 @@
if (sourcebean.getParent() == currentRootModel
.getReferenceEntityModel()) {
if (!currentbean.isPrimitive()) {
- return "${" + currentbean.getName() + "}";
+ return COMPLEX_PRIX_START + currentbean.getName() + COMPLEX_PRIX_END;
} else {
- return rootbean.getBeanClassString() + " "
+ return rootbean.getBeanClassString() + SPACE_STRING
+ sourcebean.getName();
}
} else {
@@ -319,7 +323,7 @@
JavaBeanModel jbm = (JavaBeanModel) parent
.getReferenceEntityModel();
if (jbm != null)
- returnString = jbm.getName() + " " + returnString;
+ returnString = jbm.getName() + SPACE_STRING + returnString;
JavaBeanModel jb = ((JavaBeanModel) parent
.getReferenceEntityModel()).getParent();
@@ -330,7 +334,7 @@
if (returnString.equals(sourcebean.getName())) {
returnString = ((JavaBeanModel) parent
.getReferenceEntityModel()).getBeanClassString()
- + " " + returnString;
+ + SPACE_STRING + returnString;
}
return returnString;
}
@@ -417,8 +421,8 @@
boolean connectAuto = MessageDialog
.openQuestion(
displayParent,
- "Connection Question",
- "The root models don't be connected , it will make some errors with the generation config file contents.\nDo you wan to connect them?");
+ Messages.getString("JavaBeanAnalyzer.ConnectionQuestion"), //$NON-NLS-1$
+ Messages.getString("JavaBeanAnalyzer.ConnectRootQuestion")); //$NON-NLS-1$
if (connectAuto) {
// connect root model
LineConnectionModel connectionModel = new LineConnectionModel();
@@ -490,7 +494,7 @@
targetName = targetClazz.getName();
}
String beanClass = SmooksModelUtils.getParmaText(
- "beanClass", rc);
+ SmooksModelUtils.BEAN_CLASS, rc);
if (targetName != null
&& targetName.trim().equals(beanClass)) {
setSelectorIsUsed(sourceName);
@@ -509,7 +513,7 @@
}
protected boolean isReferenceSelector(String selector) {
- return (selector.startsWith("${") && selector.endsWith("}"));
+ return (selector.startsWith(COMPLEX_PRIX_START) && selector.endsWith(COMPLEX_PRIX_END));
}
protected String getBeanIdWithRawSelectorString(String selector) {
@@ -568,7 +572,7 @@
protected JavaBeanModel findModelWithSelectorString(String selector,
JavaBeanModel parentModel) {
- String[] s = selector.trim().split(" ");
+ String[] s = selector.trim().split(SPACE_STRING);
String pname = parentModel.getName();
Class clazz = parentModel.getBeanClass();
JavaBeanModel current = parentModel;
@@ -590,12 +594,12 @@
}
private String getDataSourceClass(GraphInformations info, int dataMode) {
- String key = "sourceDataPath";
+ String key = "sourceDataPath"; //$NON-NLS-1$
if (dataMode == SOURCE_DATA) {
- key = "sourceDataPath";
+ key = "sourceDataPath"; //$NON-NLS-1$
}
if (dataMode == TARGET_DATA) {
- key = "targetDataPath";
+ key = "targetDataPath"; //$NON-NLS-1$
}
Params params = info.getParams();
@@ -660,7 +664,7 @@
} else {
model = new JavaBeanModel(null, rootClassName);
model.setRootClassModel(true);
- model.setError("Can't find the class : " + rootClassName);
+ model.setError(Messages.getString("JavaBeanAnalyzer.ClassNotExist") + rootClassName); //$NON-NLS-1$
model.setProperties(new ArrayList());
isError = true;
}
@@ -679,8 +683,8 @@
private void setCollectionsInstanceClassName(JavaBeanModel model,
ResourceConfigType resourceConfig) {
if (Collection.class.isAssignableFrom(model.getBeanClass())) {
- String instanceName = SmooksModelUtils.getParmaText("beanClass",
- resourceConfig);
+ String instanceName = SmooksModelUtils.getParmaText(
+ SmooksModelUtils.BEAN_CLASS, resourceConfig);
if (instanceName != null) {
model.setBeanClassString(instanceName);
}
@@ -742,7 +746,8 @@
return null;
Class rootClass = null;
if (rootClassName == null) {
- rootClassName = SmooksModelUtils.getParmaText("beanClass", current);
+ rootClassName = SmooksModelUtils.getParmaText(
+ SmooksModelUtils.BEAN_CLASS, current);
}
if (rootClassName != null && loader != null) {
try {
@@ -762,7 +767,7 @@
}
if (current != null) {
rootModel.setBeanClassString(SmooksModelUtils.getParmaText(
- "beanClass", current));
+ SmooksModelUtils.BEAN_CLASS, current));
setSelectorIsUsed(rootClassName);
buildChildrenOfTargetInputModel(listType, rootModel, false,
rootIsError, current, loader);
@@ -806,15 +811,15 @@
if (model == null) {
model = new JavaBeanModel(null, property);
parentModel.addProperty(model);
- model.setError("don't exist");
+ model.setError(Messages.getString("JavaBeanAnalyzer.DontExist")); //$NON-NLS-1$
}
if (isReferenceSelector(selector)) {
selector = selector.substring(2, selector.length() - 1);
ResourceConfigType resourceConfig = findResourceConfigTypeWithSelector(
selector, listType);
- model.setBeanClassString(SmooksModelUtils.getParmaText("beanClass",
- resourceConfig));
+ model.setBeanClassString(SmooksModelUtils.getParmaText(
+ SmooksModelUtils.BEAN_CLASS, resourceConfig));
if (resourceConfig != null) {
this.buildChildrenOfTargetInputModel(listType, model, false,
false, resourceConfig, classLoader);
@@ -827,7 +832,7 @@
// List paramList = resourceConfig.getParam();
// for (Iterator iterator = paramList.iterator(); iterator.hasNext();) {
// ParamType param = (ParamType) iterator.next();
- // if ("bindings".equals(param.getName())) {
+ // if (SmooksModelUtils.BINDINGS.equals(param.getName())) {
// if (param.eContents().isEmpty())
// continue;
// List bindingList = (List) param.getMixed().get(
@@ -883,7 +888,7 @@
protected void analyzeBindingSelector(String selector,
JavaBeanModel currentModel, SmooksResourceListType listType,
ClassLoader classLoader) {
- if (selector.startsWith("${") && selector.endsWith("}")) {
+ if (selector.startsWith(COMPLEX_PRIX_START) && selector.endsWith(COMPLEX_PRIX_END)) {
// should get the bean properties
// memory out???
currentModel.getProperties();
@@ -909,7 +914,7 @@
// something wrong
if (model == null) {
model = new JavaBeanModel(null, referenceSelector);
- model.setError("don't exist");
+ model.setError(Messages.getString("JavaBeanAnalyzer.DontExist")); //$NON-NLS-1$
model.setProperties(new ArrayList());
setCollectionsInstanceClassName(model, resourceConfig);
}
@@ -938,7 +943,7 @@
} else {
pm = new JavaBeanModel(null, property);
pm.setProperties(new ArrayList());
- pm.setError("don't exist");
+ pm.setError(Messages.getString("JavaBeanAnalyzer.DontExist")); //$NON-NLS-1$
currentParent.addProperty(pm);
}
currentParent = pm;
@@ -954,7 +959,7 @@
List list = config.getParam();
for (Iterator iterator = list.iterator(); iterator.hasNext();) {
ParamType p = (ParamType) iterator.next();
- if ("beanId".equals(p.getName())) {
+ if (SmooksModelUtils.BEAN_ID.equals(p.getName())) {
return SmooksModelUtils.getAnyTypeText(p);
}
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 2008-11-06 09:36:12 UTC (rev 11566)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaModelConnectionResolveCommand.java 2008-11-06 09:42:08 UTC (rev 11567)
@@ -53,7 +53,7 @@
@Override
public void execute() throws Exception {
SmooksConfigurationFileGenerateContext context = getContext();
- if(context == null) throw new RuntimeException("Smooks generated context is NULL");
+ if(context == null) throw new RuntimeException(Messages.getString("JavaModelConnectionResolveCommand.SmooksContextIsNull")); //$NON-NLS-1$
if(sourceModel != null && targetModel != null){
LineConnectionModel connectionModel = new LineConnectionModel();
connectionModel
Added: 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 (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/Messages.java 2008-11-06 09:42:08 UTC (rev 11567)
@@ -0,0 +1,22 @@
+package org.jboss.tools.smooks.javabean.analyzer;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages {
+ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.javabean.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 + '!';
+ }
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/Messages.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/messages.properties 2008-11-06 09:42:08 UTC (rev 11567)
@@ -0,0 +1,5 @@
+JavaBeanAnalyzer.ClassNotExist=Can't find the class :
+JavaBeanAnalyzer.ConnectionQuestion=Connection Question
+JavaBeanAnalyzer.ConnectRootQuestion=The root models don't be connected , it will make some errors with the generation config file contents.\nDo you wan to connect them?
+JavaBeanAnalyzer.DontExist=don't exist
+JavaModelConnectionResolveCommand.SmooksContextIsNull=Smooks generated context is NULL
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 5 months
JBoss Tools SVN: r11566 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-11-06 04:36:12 -0500 (Thu, 06 Nov 2008)
New Revision: 11566
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide1791Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java
Log:
fix build hanging in jst.jsp.test
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java 2008-11-06 09:12:35 UTC (rev 11565)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java 2008-11-06 09:36:12 UTC (rev 11566)
@@ -37,14 +37,6 @@
public void setUp() throws Exception {
provider = new TestProjectProvider("org.jboss.tools.seam.ui.test", null, getSetUpProjectName(), makeCopy);
project = provider.getProject();
- Throwable exception = null;
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception x) {
- exception = x;
- x.printStackTrace();
- }
- assertNull("An exception caught: " + (exception != null ? exception.getMessage() : ""), exception);
}
@Override
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide1791Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide1791Test.java 2008-11-06 09:12:35 UTC (rev 11565)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide1791Test.java 2008-11-06 09:36:12 UTC (rev 11566)
@@ -35,13 +35,6 @@
provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME,false);
project = provider.getProject();
Throwable exception = null;
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception x) {
- exception = x;
- x.printStackTrace();
- }
- assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
}
protected void tearDown() throws Exception {
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2008-11-06 09:12:35 UTC (rev 11565)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2008-11-06 09:36:12 UTC (rev 11566)
@@ -34,13 +34,6 @@
provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
project = provider.getProject();
Throwable exception = null;
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception x) {
- exception = x;
- x.printStackTrace();
- }
- assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
}
protected void tearDown() throws Exception {
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java 2008-11-06 09:12:35 UTC (rev 11565)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java 2008-11-06 09:36:12 UTC (rev 11566)
@@ -32,12 +32,6 @@
provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
project = provider.getProject();
Throwable exception = null;
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception x) {
- exception = x;
- x.printStackTrace();
- }
assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
}
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2008-11-06 09:12:35 UTC (rev 11565)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2008-11-06 09:36:12 UTC (rev 11566)
@@ -12,14 +12,6 @@
public void setUp() throws Exception {
provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
project = provider.getProject();
- Throwable exception = null;
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception x) {
- exception = x;
- x.printStackTrace();
- }
- assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
}
protected void tearDown() throws Exception {
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java 2008-11-06 09:12:35 UTC (rev 11565)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java 2008-11-06 09:36:12 UTC (rev 11566)
@@ -12,14 +12,6 @@
public void setUp() throws Exception {
provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
project = provider.getProject();
- Throwable exception = null;
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception x) {
- exception = x;
- x.printStackTrace();
- }
- assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
}
protected void tearDown() throws Exception {
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java 2008-11-06 09:12:35 UTC (rev 11565)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java 2008-11-06 09:36:12 UTC (rev 11566)
@@ -33,14 +33,6 @@
public void setUp() throws Exception {
provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
project = provider.getProject();
- Throwable exception = null;
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception x) {
- exception = x;
- x.printStackTrace();
- }
- assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
}
protected void tearDown() throws Exception {
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java 2008-11-06 09:12:35 UTC (rev 11565)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java 2008-11-06 09:36:12 UTC (rev 11566)
@@ -28,12 +28,7 @@
provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
project = provider.getProject();
Throwable exception = null;
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception x) {
- exception = x;
- x.printStackTrace();
- }
+
assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
}
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java 2008-11-06 09:12:35 UTC (rev 11565)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java 2008-11-06 09:36:12 UTC (rev 11566)
@@ -31,14 +31,6 @@
public void setUp() throws Exception {
provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
project = provider.getProject();
- Throwable exception = null;
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception x) {
- exception = x;
- x.printStackTrace();
- }
- assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
}
protected void tearDown() throws Exception {
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java 2008-11-06 09:12:35 UTC (rev 11565)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java 2008-11-06 09:36:12 UTC (rev 11566)
@@ -32,14 +32,6 @@
public void setUp() throws Exception {
provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
project = provider.getProject();
- Throwable exception = null;
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception x) {
- exception = x;
- x.printStackTrace();
- }
- assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
}
protected void tearDown() throws Exception {
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java 2008-11-06 09:12:35 UTC (rev 11565)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java 2008-11-06 09:36:12 UTC (rev 11566)
@@ -26,14 +26,6 @@
public void setUp() throws Exception {
provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
project = provider.getProject();
- Throwable exception = null;
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception x) {
- exception = x;
- x.printStackTrace();
- }
- assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
}
protected void tearDown() throws Exception {
17 years, 5 months
JBoss Tools SVN: r11565 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: xml2java/analyzer and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-06 04:12:35 -0500 (Thu, 06 Nov 2008)
New Revision: 11565
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/xml2java/analyzer/AbstractXMLModelAnalyzer.java
Log:
JBIDE-2995
Change the "sourceDataPath" and "targetDataPath" :
Workspace file path : "Workspace : //project/file.smooks"
File System file path : "File ://home/test.smooks"
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 2008-11-06 08:40:43 UTC (rev 11564)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-11-06 09:12:35 UTC (rev 11565)
@@ -25,6 +25,7 @@
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.smooks.utils.UIUtils;
import org.jboss.tools.smooks.xml2java.analyzer.AbstractXMLModelAnalyzer;
/**
@@ -50,9 +51,11 @@
public Object getReturnValue() {
try {
- returnObject = this.loadedTheObject(filePath);
+ String path = getFilePath();
+ path = AbstractXMLModelAnalyzer.parseFilePath(path);
+ returnObject = this.loadedTheObject(path);
} catch (Exception e) {
- e.printStackTrace();
+ UIUtils.showErrorDialog(getShell(), UIUtils.createErrorStatus(e));
}
return returnObject;
}
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 2008-11-06 08:40:43 UTC (rev 11564)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java 2008-11-06 09:12:35 UTC (rev 11565)
@@ -45,6 +45,30 @@
public AbstractXMLModelAnalyzer(String paramKey) {
this.parmaKey = paramKey;
}
+
+ public static String parseFilePath(String path) throws InvocationTargetException{
+ int index = path.indexOf(FILE_PRIX);
+ if (index != -1) {
+ path = path.substring(index + FILE_PRIX.length(), path.length());
+ } else {
+ index = path.indexOf(WORKSPACE_PRIX);
+ if (index != -1) {
+ path = path.substring(index + WORKSPACE_PRIX.length(), path
+ .length());
+ Path wpath = new Path(path);
+ IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(
+ wpath);
+ if (file.exists()) {
+ path = file.getLocation().toOSString();
+ } else {
+ throw new InvocationTargetException(new Exception("file dosen't exist" + path + " on the workspace."));
+ }
+ }else{
+ throw new InvocationTargetException(new Exception("Illegal file path : " + path + "."));
+ }
+ }
+ return path;
+ }
public Object buildSourceInputObjects(GraphInformations graphInfo,
SmooksResourceListType listType, IFile sourceFile)
@@ -67,26 +91,7 @@
// throw new InvocationTargetException(new Exception(
// "xml file can't be found in the .graph file."));
}
- int index = path.indexOf(FILE_PRIX);
- if (index != -1) {
- path = path.substring(index + FILE_PRIX.length(), path.length());
- } else {
- index = path.indexOf(WORKSPACE_PRIX);
- if (index != -1) {
- path = path.substring(index + WORKSPACE_PRIX.length(), path
- .length());
- Path wpath = new Path(path);
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(
- wpath);
- if (file.exists()) {
- path = file.getLocation().toOSString();
- } else {
- throw new InvocationTargetException(new Exception("file dosen't exist" + path + " on the workspace."));
- }
- }else{
- throw new InvocationTargetException(new Exception("Illegal file path : " + path + "."));
- }
- }
+ path = parseFilePath(path);
XMLObjectAnalyzer objectBuilder = new XMLObjectAnalyzer();
try {
FileInputStream stream = new FileInputStream(path);
17 years, 5 months
JBoss Tools SVN: r11564 - trunk/smooks/tests/org.jboss.tools.smooks.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-06 03:40:43 -0500 (Thu, 06 Nov 2008)
New Revision: 11564
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF
Log:
JBIDE-3117
set the plug-in providers to "JBoss, a division of Red Hat"
Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF 2008-11-06 08:40:34 UTC (rev 11563)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF 2008-11-06 08:40:43 UTC (rev 11564)
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Test Plug-in
+Bundle-Name: Smooks Tools Test Plug-in
Bundle-SymbolicName: org.jboss.tools.smooks.test
Bundle-Version: 1.0.0
Bundle-Activator: org.jboss.tools.smooks.test.Activator
@@ -18,3 +18,4 @@
Eclipse-LazyStart: true
Bundle-ClassPath: lib/dom4j-1.6.1.jar,
.
+Bundle-Vendor: JBoss, a division of Red Hat
17 years, 5 months
JBoss Tools SVN: r11563 - in trunk/smooks/plugins: org.jboss.tools.smooks.ui/META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-06 03:40:34 -0500 (Thu, 06 Nov 2008)
New Revision: 11563
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF
trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
Log:
JBIDE-3117
set the plug-in providers to "JBoss, a division of Red Hat"
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF 2008-11-06 08:33:10 UTC (rev 11562)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF 2008-11-06 08:40:34 UTC (rev 11563)
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Core Plug-in
+Bundle-Name: Smooks Tools Core Plug-in
Bundle-SymbolicName: org.jboss.tools.smooks.core;singleton:=true
Bundle-Version: 1.0.0
Bundle-Activator: org.jboss.tools.smooks.core.SmooksCoreActivator
@@ -17,3 +17,4 @@
org.jboss.tools.smooks.model.impl,
org.jboss.tools.smooks.model.provider,
org.jboss.tools.smooks.model.util
+Bundle-Vendor: JBoss, a division of Red Hat
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-11-06 08:33:10 UTC (rev 11562)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-11-06 08:40:34 UTC (rev 11563)
@@ -27,7 +27,7 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .,
libs/dom4j-1.6.1.jar
-Bundle-Vendor: JBoss
+Bundle-Vendor: JBoss, a division of Red Hat
Export-Package: org.jboss.tools.smooks.analyzer,
org.jboss.tools.smooks.graphical,
org.jboss.tools.smooks.graphical.impl,
17 years, 5 months
JBoss Tools SVN: r11562 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: xml2java/analyzer and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-06 03:33:10 -0500 (Thu, 06 Nov 2008)
New Revision: 11562
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/xml2java/analyzer/AbstractXMLModelAnalyzer.java
Log:
JBIDE-2995
Change the "sourceDataPath" and "targetDataPath" :
Workspace file path : "Workspace : //project/file.smooks"
File System file path : "File ://home/test.smooks"
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 2008-11-06 08:31:19 UTC (rev 11561)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-11-06 08:33:10 UTC (rev 11562)
@@ -25,6 +25,7 @@
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.smooks.xml2java.analyzer.AbstractXMLModelAnalyzer;
/**
*
@@ -153,7 +154,8 @@
// dialog.setInitialSelections(selectedResources);
if (files.length > 0) {
IFile file = files[0];
- String s = file.getLocation().toOSString();
+ String s = file.getFullPath().toPortableString();
+ s = AbstractXMLModelAnalyzer.WORKSPACE_PRIX + s;
relationT.setText(s);
}
}
@@ -276,6 +278,7 @@
FileDialog dialog = new FileDialog(this.getShell());
String path = dialog.open();
if (path != null) {
+ path = AbstractXMLModelAnalyzer.FILE_PRIX + path;
relationText.setText(path);
}
}
@@ -286,10 +289,10 @@
if (text == null || "".equals(text))
error = "Please Select a file";
- File tempFile = new File(text);
- if(!tempFile.exists()){
- error = "Can't find the file , please select another one.";
- }
+// File tempFile = new File(text);
+// if(!tempFile.exists()){
+// error = "Can't find the file , please select another one.";
+// }
// if (!reasourceLoaded) {
// error = "Resource must be loaded";
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 2008-11-06 08:31:19 UTC (rev 11561)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java 2008-11-06 08:33:10 UTC (rev 11562)
@@ -18,6 +18,8 @@
import org.dom4j.DocumentException;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.Path;
import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer;
import org.jboss.tools.smooks.analyzer.ITargetModelAnalyzer;
import org.jboss.tools.smooks.graphical.GraphInformations;
@@ -31,11 +33,16 @@
* @author Dart Peng<br>
* Date : Sep 23, 2008
*/
-public class AbstractXMLModelAnalyzer implements ISourceModelAnalyzer , ITargetModelAnalyzer {
+public class AbstractXMLModelAnalyzer implements ISourceModelAnalyzer,
+ ITargetModelAnalyzer {
+ public static final String FILE_PRIX = "File:/";
+
+ public static final String WORKSPACE_PRIX = "Workspace:/";
+
private String parmaKey = "";
-
- public AbstractXMLModelAnalyzer(String paramKey){
+
+ public AbstractXMLModelAnalyzer(String paramKey) {
this.parmaKey = paramKey;
}
@@ -56,11 +63,30 @@
}
}
if (path == null) {
- // TODO tell user the filepath can't find or not ?
return null;
-// throw new InvocationTargetException(new Exception(
-// "xml file path can't find in the graphInfo file"));
+ // throw new InvocationTargetException(new Exception(
+ // "xml file can't be found in the .graph file."));
}
+ int index = path.indexOf(FILE_PRIX);
+ if (index != -1) {
+ path = path.substring(index + FILE_PRIX.length(), path.length());
+ } else {
+ index = path.indexOf(WORKSPACE_PRIX);
+ if (index != -1) {
+ path = path.substring(index + WORKSPACE_PRIX.length(), path
+ .length());
+ Path wpath = new Path(path);
+ IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(
+ wpath);
+ if (file.exists()) {
+ path = file.getLocation().toOSString();
+ } else {
+ throw new InvocationTargetException(new Exception("file dosen't exist" + path + " on the workspace."));
+ }
+ }else{
+ throw new InvocationTargetException(new Exception("Illegal file path : " + path + "."));
+ }
+ }
XMLObjectAnalyzer objectBuilder = new XMLObjectAnalyzer();
try {
FileInputStream stream = new FileInputStream(path);
@@ -76,6 +102,6 @@
public Object buildTargetInputObjects(GraphInformations graphInfo,
SmooksResourceListType listType, IFile sourceFile)
throws InvocationTargetException {
- return buildSourceInputObjects(graphInfo,listType,sourceFile);
+ return buildSourceInputObjects(graphInfo, listType, sourceFile);
}
}
17 years, 5 months
JBoss Tools SVN: r11561 - trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-06 03:31:19 -0500 (Thu, 06 Nov 2008)
New Revision: 11561
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java
Log:
JBIDE-3109: default pools are all chosen, the next button should be enable.
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java 2008-11-06 08:25:43 UTC (rev 11560)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java 2008-11-06 08:31:19 UTC (rev 11561)
@@ -65,7 +65,6 @@
addSelectionButtons(composite);
setControl(composite);
- initializePage();
initializeViewer();
}
@@ -167,10 +166,6 @@
return button;
}
- private void initializePage() {
- setPageComplete(false);
- }
-
private void initializeViewer() {
if (listViewer == null) {
return;
@@ -186,6 +181,7 @@
listViewer.setAllChecked(true);
selectButton.setEnabled(false);
deselectButton.setEnabled(true);
+ changeComplete();
}
private Composite createDialogArea(Composite parent) {
17 years, 5 months
JBoss Tools SVN: r11560 - trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-06 03:25:43 -0500 (Thu, 06 Nov 2008)
New Revision: 11560
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java
Log:
JBIDE-3110: BPMN -> jPDL wizard should filter target location selections
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java 2008-11-06 08:24:24 UTC (rev 11559)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java 2008-11-06 08:25:43 UTC (rev 11560)
@@ -12,6 +12,7 @@
package org.jboss.tools.jbpm.convert.bpmnto.wizard;
import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -36,8 +37,6 @@
import org.eclipse.ui.model.WorkbenchContentProvider;
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.jboss.tools.jbpm.convert.b2j.messages.B2JMessages;
-import org.jboss.tools.jbpm.convert.bpmnto.wizard.BpmnToWizard;
-import org.jboss.tools.jbpm.convert.bpmnto.wizard.ProFilter;
/**
* @author Grid Qian
@@ -180,6 +179,10 @@
class ProFilter extends ViewerFilter {
@Override
public boolean select(Viewer viewer, Object parent, Object element) {
- return element instanceof IContainer;
+ if (element instanceof IContainer) {
+ return ((IContainer)element).getProject().isAccessible();
+ } else {
+ return false;
+ }
}
}
17 years, 5 months
JBoss Tools SVN: r11559 - trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-06 03:24:24 -0500 (Thu, 06 Nov 2008)
New Revision: 11559
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BPMNResourcesChoicePage.java
Log:
JBIDE-3108: BPMN -> jPDL wizard should filter selections
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BPMNResourcesChoicePage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BPMNResourcesChoicePage.java 2008-11-06 07:58:51 UTC (rev 11558)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BPMNResourcesChoicePage.java 2008-11-06 08:24:24 UTC (rev 11559)
@@ -13,7 +13,9 @@
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -32,8 +34,6 @@
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.jboss.tools.jbpm.convert.b2j.messages.B2JMessages;
import org.jboss.tools.jbpm.convert.bpmnto.util.BPMNToUtil;
-import org.jboss.tools.jbpm.convert.bpmnto.wizard.BpmnToWizard;
-import org.jboss.tools.jbpm.convert.bpmnto.wizard.ProjectFilter;
/**
* @author Grid Qian
@@ -41,7 +41,7 @@
* the wizardpage used by user to choose the bpmn file
*/
public class BPMNResourcesChoicePage extends WizardPage {
-
+
private TreeViewer viewer;
private ISelection currentSelection;
private IWizard wizard;
@@ -132,18 +132,46 @@
}
class ProjectFilter extends ViewerFilter {
+ private static String BPMN_FILE_EXT = "bpmn";
+
@Override
public boolean select(Viewer viewer, Object parent, Object element) {
boolean res = false;
if (element instanceof IFile) {
IFile file = (IFile) element;
- if (file.getFileExtension().equalsIgnoreCase("bpmn")) {
- res = true;
+ if (file.getFileExtension().equalsIgnoreCase(BPMN_FILE_EXT)) {
+ res = file.getProject().isAccessible();
}
}
if (element instanceof IContainer) {
- res = true;
+ IContainer container = (IContainer)element;
+ if (container.getProject().isAccessible()) {
+ res = hasBPMNResources(container);
+ }
}
return res;
}
+
+ private boolean hasBPMNResources(IContainer container) {
+ boolean res = false;
+ try {
+ IResource[] resources = container.members();
+ for (int i = 0; i < resources.length; i++) {
+ if (resources[i] instanceof IFile
+ && ((IFile)resources[i]).getFileExtension().equalsIgnoreCase(BPMN_FILE_EXT)) {
+ res = true;
+ break;
+ }
+ if (resources[i] instanceof IContainer) {
+ if (hasBPMNResources((IContainer)resources[i])) {
+ res = true;
+ break;
+ }
+ }
+ }
+ } catch (CoreException ce) {
+ // Ignore
+ }
+ return res;
+ }
}
17 years, 5 months
JBoss Tools SVN: r11558 - trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-06 02:58:51 -0500 (Thu, 06 Nov 2008)
New Revision: 11558
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java
Log:
JBIDE-3109: BPMN -> jPDL wizard should select available pools by default
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java 2008-11-06 05:48:59 UTC (rev 11557)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java 2008-11-06 07:58:51 UTC (rev 11558)
@@ -11,9 +11,7 @@
package org.jboss.tools.jbpm.convert.bpmnto.wizard;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -45,6 +43,8 @@
public class BpmnPoolsChoicePage extends WizardPage {
CheckboxTableViewer listViewer;
+ Button selectButton;
+ Button deselectButton;
String listTitle;
private Map<String, String> idMap;
@@ -92,10 +92,19 @@
(((BpmnToWizard) wizard)).getPoolIdList().add(
((Entry<String, String>) event.getElement())
.getKey());
+ deselectButton.setEnabled(true);
+ if ((((BpmnToWizard) wizard)).getPoolIdList().size() == idMap
+ .size()) {
+ selectButton.setEnabled(false);
+ }
} else {
(((BpmnToWizard) wizard)).getPoolIdList().remove(
((Entry<String, String>) event.getElement())
.getKey());
+ selectButton.setEnabled(true);
+ if ((((BpmnToWizard) wizard)).getPoolIdList().size() == 0) {
+ deselectButton.setEnabled(false);
+ }
}
changeComplete();
}
@@ -112,12 +121,14 @@
buttonComposite.setLayoutData(new GridData(SWT.END, SWT.TOP, true,
false));
- Button selectButton = createButton(buttonComposite,
+ selectButton = createButton(buttonComposite,
B2JMessages.Label_Select_All, false);
SelectionListener listener = new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
listViewer.setAllChecked(true);
+ selectButton.setEnabled(false);
+ deselectButton.setEnabled(true);
(((BpmnToWizard) wizard)).getPoolIdList()
.addAll(idMap.keySet());
changeComplete();
@@ -125,12 +136,14 @@
};
selectButton.addSelectionListener(listener);
- Button deselectButton = createButton(buttonComposite,
+ deselectButton = createButton(buttonComposite,
B2JMessages.Label_Deselect_All, false);
listener = new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
listViewer.setAllChecked(false);
+ selectButton.setEnabled(true);
+ deselectButton.setEnabled(false);
(((BpmnToWizard) wizard)).getPoolIdList().clear();
changeComplete();
}
@@ -166,24 +179,13 @@
listViewer.setInput(idMap.entrySet());
} else {
listViewer.setInput(null);
+ return;
}
wizard = this.getWizard();
- List<String> poolIdList = ((BpmnToWizard) wizard).getPoolIdList();
- if (poolIdList.size() == 0) {
- listViewer.setAllChecked(false);
- } else {
- for (String id : poolIdList) {
- Set<Entry<String, String>> set = idMap.entrySet();
- Entry<String, String> selectedEntry = null;
- for (Entry<String, String> entry : set) {
- if (entry.getKey().equals(id)) {
- selectedEntry = entry;
- break;
- }
- }
- listViewer.setChecked(selectedEntry, true);
- }
- }
+ (((BpmnToWizard) wizard)).getPoolIdList().addAll(idMap.keySet());
+ listViewer.setAllChecked(true);
+ selectButton.setEnabled(false);
+ deselectButton.setEnabled(true);
}
private Composite createDialogArea(Composite parent) {
17 years, 5 months