JBoss Tools SVN: r16318 - in trunk: archives/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315 and 12 other directories.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2009-07-01 09:55:12 -0400 (Wed, 01 Jul 2009)
New Revision: 16318
Removed:
trunk/archives/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/bin/
trunk/archives/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/bin/
trunk/archives/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2439a/bin/
trunk/archives/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2439b/bin/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/bin/
trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/bin/
trunk/maven/plugins/org.jboss.tools.maven.core/bin/
trunk/maven/plugins/org.jboss.tools.maven.seam/bin/
trunk/maven/plugins/org.jboss.tools.maven.ui/bin/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/bin/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/bin/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/bin/
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamSettingsPreferencesPage/bin/
trunk/workingset/tests/org.jboss.tools.workingset.core.test/bin/
Log:
remove broken bin
15 years, 8 months
JBoss Tools SVN: r16317 - branches/jbosstools-3.1.0.M2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2009-07-01 06:59:16 -0400 (Wed, 01 Jul 2009)
New Revision: 16317
Modified:
branches/jbosstools-3.1.0.M2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/SetupTemplateContributionItem.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4541, popup menu index for setup custom template item was corrected.
Modified: branches/jbosstools-3.1.0.M2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/SetupTemplateContributionItem.java
===================================================================
--- branches/jbosstools-3.1.0.M2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/SetupTemplateContributionItem.java 2009-07-01 10:40:44 UTC (rev 16316)
+++ branches/jbosstools-3.1.0.M2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/SetupTemplateContributionItem.java 2009-07-01 10:59:16 UTC (rev 16317)
@@ -73,7 +73,11 @@
element.getNodeName()));
getAction().setActionNode(element);
getAction().setData(elementMapping.getTemplate().getAnyData());
- super.fill(menu, index+1);
+ /*
+ * https://jira.jboss.org/jira/browse/JBIDE-4541
+ * Index should be used as is.
+ */
+ super.fill(menu, index);
}
}
15 years, 8 months
JBoss Tools SVN: r16316 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2009-07-01 06:40:44 -0400 (Wed, 01 Jul 2009)
New Revision: 16316
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/SetupTemplateContributionItem.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4541, popup menu index for setup custom template item was corrected.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/SetupTemplateContributionItem.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/SetupTemplateContributionItem.java 2009-07-01 10:27:20 UTC (rev 16315)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/SetupTemplateContributionItem.java 2009-07-01 10:40:44 UTC (rev 16316)
@@ -73,7 +73,11 @@
element.getNodeName()));
getAction().setActionNode(element);
getAction().setData(elementMapping.getTemplate().getAnyData());
- super.fill(menu, index+1);
+ /*
+ * https://jira.jboss.org/jira/browse/JBIDE-4541
+ * Index should be used as is.
+ */
+ super.fill(menu, index);
}
}
15 years, 8 months
JBoss Tools SVN: r16315 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common.
by jbosstools-commits@lists.jboss.org
Author: mareshkau
Date: 2009-07-01 06:27:20 -0400 (Wed, 01 Jul 2009)
New Revision: 16315
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSStyleValueValidator.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4526
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2009-07-01 09:59:51 UTC (rev 16314)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2009-07-01 10:27:20 UTC (rev 16315)
@@ -218,7 +218,6 @@
}
public void release() {
- IModelManager modelManager = StructuredModelManager.getModelManager();
if ((model != null) /* && !modelManager.isShared(model.getId()) */) {
model.releaseFromEdit();
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSStyleValueValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSStyleValueValidator.java 2009-07-01 09:59:51 UTC (rev 16314)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSStyleValueValidator.java 2009-07-01 10:27:20 UTC (rev 16315)
@@ -83,7 +83,7 @@
* @author yradtsevich
*
*/
- private class LogHacker {
+ private static class LogHacker {
private Field logListeners = null;
private Object oldValue = null;
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java 2009-07-01 09:59:51 UTC (rev 16314)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java 2009-07-01 10:27:20 UTC (rev 16315)
@@ -176,7 +176,7 @@
* @return Array two strings, or null, if str incorrect
*/
public static String[] convertExtString(String str) {
- if (str.equalsIgnoreCase(THIN)) {
+ if (THIN.equalsIgnoreCase(str)) {
return new String[] { THIN, Constants.EMPTY };
}
if (str == null) {
15 years, 8 months
JBoss Tools SVN: r16314 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration: validate and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: DartPeng
Date: 2009-07-01 05:59:51 -0400 (Wed, 01 Jul 2009)
New Revision: 16314
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataConfiguraitonWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/BeanIdRefValidator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ClassFieldEditorValidator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DuplicatedBeanIDValidator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ISmooksValidator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java
Log:
JBIDE-4540
Smooks validation runs too slowly , change the validator interface to fix this problem.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataConfiguraitonWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataConfiguraitonWizardPage.java 2009-07-01 09:50:30 UTC (rev 16313)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataConfiguraitonWizardPage.java 2009-07-01 09:59:51 UTC (rev 16314)
@@ -282,11 +282,11 @@
gd = new GridData(GridData.FILL_HORIZONTAL);
- addButton = new Button(buttonComposite, SWT.BORDER);
+ addButton = new Button(buttonComposite, SWT.NONE);
addButton.setLayoutData(gd);
addButton.setText("Add");
- removeButton = new Button(buttonComposite, SWT.BORDER);
+ removeButton = new Button(buttonComposite, SWT.NONE);
removeButton.setLayoutData(gd);
removeButton.setText("Remove");
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/BeanIdRefValidator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/BeanIdRefValidator.java 2009-07-01 09:50:30 UTC (rev 16313)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/BeanIdRefValidator.java 2009-07-01 09:59:51 UTC (rev 16314)
@@ -53,19 +53,6 @@
*/
@Override
public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain) {
- idList.clear();
- Resource resource = editingDomain.getResourceSet().getResources().get(0);
- Object obj = resource.getContents().get(0);
- if (obj instanceof DocumentRoot) {
- SmooksResourceListType listType = ((DocumentRoot) obj).getSmooksResourceList();
- List<String> ids = SmooksUIUtils.getBeanIdStringList(listType);
- if (ids != null){
- idList.addAll(ids);
- }
- }
- if (idList.isEmpty()) {
- // return null;
- }
return super.validate(selectedObjects, editingDomain);
}
@@ -96,4 +83,20 @@
return super.validateModel(model, editingDomain);
}
+ public void initValidator(Collection<?> selectedObjects, EditingDomain editingDomain) {
+ idList.clear();
+ Resource resource = editingDomain.getResourceSet().getResources().get(0);
+ Object obj = resource.getContents().get(0);
+ if (obj instanceof DocumentRoot) {
+ SmooksResourceListType listType = ((DocumentRoot) obj).getSmooksResourceList();
+ List<String> ids = SmooksUIUtils.getBeanIdStringList(listType);
+ if (ids != null) {
+ idList.addAll(ids);
+ }
+ }
+ if (idList.isEmpty()) {
+ // return
+ }
+ }
+
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ClassFieldEditorValidator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ClassFieldEditorValidator.java 2009-07-01 09:50:30 UTC (rev 16313)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ClassFieldEditorValidator.java 2009-07-01 09:59:51 UTC (rev 16314)
@@ -91,4 +91,9 @@
public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain) {
return validate(selectedObjects);
}
+
+ public void initValidator(Collection<?> selectedObjects, EditingDomain editingDomain) {
+ // TODO Auto-generated method stub
+
+ }
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DuplicatedBeanIDValidator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DuplicatedBeanIDValidator.java 2009-07-01 09:50:30 UTC (rev 16313)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DuplicatedBeanIDValidator.java 2009-07-01 09:59:51 UTC (rev 16314)
@@ -41,11 +41,6 @@
*/
@Override
public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain) {
- beanIdList.clear();
- findDuplicatedBeanId(selectedObjects , new ArrayList<String>());
- if(beanIdList.isEmpty()){
- return null;
- }
List<Diagnostic> list = new ArrayList<Diagnostic>();
validateModel(selectedObjects, list);//, editingDomain)
return list;
@@ -141,4 +136,12 @@
}
}
}
+
+ public void initValidator(Collection<?> selectedObjects, EditingDomain editingDomain) {
+ beanIdList.clear();
+ findDuplicatedBeanId(selectedObjects , new ArrayList<String>());
+ if(beanIdList.isEmpty()){
+ return ;
+ }
+ }
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ISmooksValidator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ISmooksValidator.java 2009-07-01 09:50:30 UTC (rev 16313)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ISmooksValidator.java 2009-07-01 09:59:51 UTC (rev 16314)
@@ -21,5 +21,8 @@
*
*/
public interface ISmooksValidator {
+
+ public void initValidator(Collection<?> selectedObjects, EditingDomain editingDomain);
+
public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java 2009-07-01 09:50:30 UTC (rev 16313)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java 2009-07-01 09:59:51 UTC (rev 16314)
@@ -74,36 +74,6 @@
*/
@Override
public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain) {
- list.clear();
- Resource resource = editingDomain.getResourceSet().getResources().get(0);
- if (resource.getContents().isEmpty()) {
- return super.validate(selectedObjects, editingDomain);
- }
- Object obj = resource.getContents().get(0);
- SmooksResourceListType listType = null;
- if (obj instanceof DocumentRoot) {
- listType = ((DocumentRoot) obj).getSmooksResourceList();
- IResource r = SmooksUIUtils.getResource(listType);
- IFile file = null;
- if (r instanceof IFile) {
- file = (IFile) r;
- }
- final IFile ff = file;
- String extName = ff.getName() + ".ext";
-
- IFile extFile = ff.getParent().getFile(new Path(extName));
- try {
- extType = SmooksUIUtils.loadSmooksGraphicsExt(extFile);
- } catch (IOException e) {
- // ignore
- }
- }
- if (extType != null) {
- List<Object> l = SelectoreSelectionDialog.generateInputData(extType, listType);
- if (l != null) {
- list.addAll(l);
- }
- }
return super.validate(selectedObjects, editingDomain);
}
@@ -249,4 +219,37 @@
return null;
}
+ public void initValidator(Collection<?> selectedObjects, EditingDomain editingDomain) {
+ list.clear();
+ Resource resource = editingDomain.getResourceSet().getResources().get(0);
+ if (resource.getContents().isEmpty()) {
+ return;
+ }
+ Object obj = resource.getContents().get(0);
+ SmooksResourceListType listType = null;
+ if (obj instanceof DocumentRoot) {
+ listType = ((DocumentRoot) obj).getSmooksResourceList();
+ IResource r = SmooksUIUtils.getResource(listType);
+ IFile file = null;
+ if (r instanceof IFile) {
+ file = (IFile) r;
+ }
+ final IFile ff = file;
+ String extName = ff.getName() + ".ext";
+
+ IFile extFile = ff.getParent().getFile(new Path(extName));
+ try {
+ extType = SmooksUIUtils.loadSmooksGraphicsExt(extFile);
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ if (extType != null) {
+ List<Object> l = SelectoreSelectionDialog.generateInputData(extType, listType);
+ if (l != null) {
+ list.addAll(l);
+ }
+ }
+ }
+
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java 2009-07-01 09:50:30 UTC (rev 16313)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java 2009-07-01 09:59:51 UTC (rev 16314)
@@ -166,6 +166,7 @@
list.add(diagnostic);
for (Iterator<?> iterator = this.validatorList.iterator(); iterator.hasNext();) {
ISmooksValidator validator = (ISmooksValidator) iterator.next();
+ validator.initValidator(selectedObjects, domain);
List<Diagnostic> d = validator.validate(selectedObjects, domain);
if (d != null) {
for (Iterator<?> iterator2 = d.iterator(); iterator2.hasNext();) {
@@ -324,4 +325,9 @@
public void validate(IValidationContext helper, IReporter reporter) throws ValidationException {
}
+
+ public void initValidator(Collection<?> selectedObjects, EditingDomain editingDomain) {
+ // TODO Auto-generated method stub
+
+ }
}
15 years, 8 months
JBoss Tools SVN: r16313 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts.
by jbosstools-commits@lists.jboss.org
Author: Grid.Qian
Date: 2009-07-01 05:50:30 -0400 (Wed, 01 Jul 2009)
New Revision: 16313
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CollapsableEditPart.java
Log:
JBIDE-4539: when collapse a element, there is java.util.ConcurrentModificationException
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CollapsableEditPart.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CollapsableEditPart.java 2009-07-01 08:19:58 UTC (rev 16312)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CollapsableEditPart.java 2009-07-01 09:50:30 UTC (rev 16313)
@@ -246,17 +246,40 @@
// figures
refreshChildren();
- // Manually remove the rest of the children
+
+ // changed by Grid.Qian
+ // when use figure.remove() to remove the children element
+ // we will change the list of figure.getChildren()
+ // so we will get the a error.
+ int size = figure.getChildren().size();
+ for(int i = 0; i < size; i++){
+ figure.remove((IFigure)figure.getChildren().get(0));
+ }
+
+ /*// Manually remove the rest of the children
for (Object o : figure.getChildren()) {
figure.remove((IFigure)o);
- }
+ }*/
+
+
// Now restore the collapsed children, border and layout
addCollapsedContents(figure);
} else {
- // Manually remove the children
+
+ // changed by Grid.Qian
+ // when use figure.remove() to remove the children element
+ // we will change the list of figure.getChildren()
+ // so we will get the a error.
+ int size = figure.getChildren().size();
+ for(int i = 0; i < size; i++){
+ figure.remove((IFigure)figure.getChildren().get(0));
+ }
+
+ /*// Manually remove the children
for (Object o : figure.getChildren()) {
figure.remove((IFigure)o);
- }
+ }*/
+
// Now restore the expanded children, border and layout
configureExpandedFigure(figure);
refreshChildren();
15 years, 8 months
JBoss Tools SVN: r16312 - in trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test: jsonparse and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: DartPeng
Date: 2009-07-01 04:19:58 -0400 (Wed, 01 Jul 2009)
New Revision: 16312
Added:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/JsonParserTest.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/input-message.jsn
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/smooks-config.xml
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/smooks-config.xml.ext
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/BaseTestCase.java
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/AbstractSmooks11ModelTestCase.java
Log:
JBIDE-4217
Add Json data parser unit test
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/JsonParserTest.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/JsonParserTest.java (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/JsonParserTest.java 2009-07-01 08:19:58 UTC (rev 16312)
@@ -0,0 +1,95 @@
+package org.jboss.tools.smooks.test.jsonparse;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.dom4j.DocumentException;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject;
+import org.jboss.tools.smooks.configuration.editors.uitls.JsonInputDataParser;
+import org.jboss.tools.smooks.model.graphics.ext.DocumentRoot;
+import org.jboss.tools.smooks.model.graphics.ext.InputType;
+import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType;
+import org.jboss.tools.smooks.model.graphics.ext.util.SmooksGraphicsExtResourceFactoryImpl;
+import org.jboss.tools.smooks.model.json.JsonReader;
+import org.jboss.tools.smooks.model.smooks.SmooksResourceListType;
+import org.jboss.tools.smooks.model.smooks.util.SmooksResourceFactoryImpl;
+import org.jboss.tools.smooks.test.model11.BaseTestCase;
+
+public class JsonParserTest extends BaseTestCase {
+ public void testParser1() throws IOException, ParserConfigurationException, DocumentException, InvocationTargetException {
+ Resource extResource = new SmooksGraphicsExtResourceFactoryImpl().createResource(null);
+ extResource.load(JsonParserTest.class.getResourceAsStream("smooks-config.xml.ext"), null);
+ SmooksGraphicsExtType extType = ((DocumentRoot) extResource.getContents().get(0)).getSmooksGraphicsExt();
+ Resource smooksResource = new SmooksResourceFactoryImpl().createResource(null);
+
+ assertNotNull(extType);
+ InputType inputType = null;
+ List<?> ilist = extType.getInput();
+ for (Iterator<?> iterator = ilist.iterator(); iterator.hasNext();) {
+ Object object = (Object) iterator.next();
+ if(object instanceof InputType){
+ if("json".equalsIgnoreCase( ((InputType)object).getType())){
+ inputType = (InputType)object;
+ break;
+ }
+ }
+ }
+
+ smooksResource.load(JsonParserTest.class.getResourceAsStream("smooks-config.xml"), null);
+
+ SmooksResourceListType resourceList = ((org.jboss.tools.smooks.model.smooks.DocumentRoot) smooksResource
+ .getContents().get(0)).getSmooksResourceList();
+ assertNotNull(resourceList);
+ JsonInputDataParser parser = new JsonInputDataParser();
+
+ JsonReader reader = null;
+ List<?> list = resourceList.getAbstractReader();
+ for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) {
+ Object object = (Object) iterator.next();
+ if(object instanceof JsonReader){
+ reader = (JsonReader)object;
+ }
+ }
+ IXMLStructuredObject model = parser.parseJsonFile(JsonParserTest.class.getResourceAsStream("input-message.jsn"), reader);
+ List<IXMLStructuredObject> children = model.getChildren();
+ assertEquals(children.size(), 1);
+ IXMLStructuredObject rootModel = children.get(0);
+ checkModel(rootModel);
+
+ parser = new JsonInputDataParser();
+
+ model = parser.parseJsonFile(JsonParserTest.class.getResourceAsStream("input-message.jsn"), inputType, resourceList);
+ children = model.getChildren();
+ assertEquals(children.size(), 1);
+ rootModel = children.get(0);
+ checkModel(rootModel);
+ }
+
+ private void checkModel(IXMLStructuredObject model){
+ assertEquals("root", model.getNodeName());
+ assertEquals(2, model.getChildren().size());
+ for (Iterator<?> iterator = model.getChildren().iterator(); iterator.hasNext();) {
+ IXMLStructuredObject child = (IXMLStructuredObject) iterator.next();
+ if(child.getNodeName().equals("header")){
+ List<?> list = child.getChildren();
+ boolean checked = false;
+ for (Iterator<?> iterator2 = list.iterator(); iterator2.hasNext();) {
+ Object object = (Object) iterator2.next();
+ if(object instanceof IXMLStructuredObject){
+ if(((IXMLStructuredObject)object).getNodeName().equals("date-time") ||
+ ((IXMLStructuredObject)object).getNodeName().equals("timeanddate")){
+ checked = true;
+ }
+ }
+ }
+ assertEquals(checked, true);
+ }
+ }
+ }
+
+}
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/JsonParserTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/input-message.jsn
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/input-message.jsn (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/input-message.jsn 2009-07-01 08:19:58 UTC (rev 16312)
@@ -0,0 +1,31 @@
+{
+ "header" : {
+ "order id" : 1,
+ "status code" : 0,
+ "net amount" : 59.97,
+ "total amount" : 64.92,
+ "tax" : 4.95,
+ "date&time" : "Wed Nov 15 13:45:28 EST 2006",
+ "customer details" : {
+ "username" : "HenkJansen",
+ "firstname" : "Henk",
+ "lastname" : "Jansen",
+ "state" : "SD"
+ }
+ },
+ "order item" : [
+ {
+ "quantity" : 1,
+ "product id" : 364,
+ "title" : "The 40-Year-Old Virgin",
+ "price" : 29.98
+ },
+ {
+ "quantity" : 1,
+ "product id" : 299,
+ "title" : "Pulp Fiction",
+ "price" : 29.99
+ }
+
+ ]
+}
\ No newline at end of file
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/smooks-config.xml
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/smooks-config.xml (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/smooks-config.xml 2009-07-01 08:19:58 UTC (rev 16312)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<smooks-resource-list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" xmlns:json="http://www.milyn.org/xsd/smooks/json-1.1.xsd" default-selector="/root/order-item/">
+ <params>
+ <param name="stream.filter.type">SAX</param>
+ </params>
+ <abstract-reader xsi:type="json:reader" arrayElementName="element" encoding="UTF-8" keyWhitspaceReplacement="-" rootName="root">
+ <json:keyMap>
+ <json:key from="date&time" to="timeanddate"/>
+ </json:keyMap>
+ </abstract-reader>
+</smooks-resource-list>
\ No newline at end of file
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/smooks-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/smooks-config.xml.ext
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/smooks-config.xml.ext (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/jsonparse/smooks-config.xml.ext 2009-07-01 08:19:58 UTC (rev 16312)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<smooks-graphics-ext xmlns="http://www.jboss.org/jbosstools/smooks/smooks-graphics-ext.xsd">
+ <input type="json">
+ <param name="path">Workspace://test/src/json.jsn</param>
+ <param name="linkJSONReader">true</param>
+ </input>
+
+ <input type="json">
+ <param name="path">Workspace://test/src/json.jsn</param>
+ <param name="encoding">UTF-8</param>
+ <param name="_key_date&time">date-time</param>
+ <param name="spaceReplace">-</param>
+ <param name="arrayElementName">element</param>
+ <param name="rootName">root</param>
+ </input>
+</smooks-graphics-ext>
\ No newline at end of file
Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/AbstractSmooks11ModelTestCase.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/AbstractSmooks11ModelTestCase.java 2009-07-01 08:15:24 UTC (rev 16311)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/AbstractSmooks11ModelTestCase.java 2009-07-01 08:19:58 UTC (rev 16312)
@@ -15,51 +15,31 @@
import java.util.Collections;
import java.util.HashMap;
-import junit.framework.TestCase;
-
import org.eclipse.emf.common.command.BasicCommandStack;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage.Registry;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.calc.CalcPackage;
import org.jboss.tools.smooks.model.calc.provider.CalcItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.common.CommonPackage;
import org.jboss.tools.smooks.model.common.provider.CommonItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.csv.CsvPackage;
import org.jboss.tools.smooks.model.csv.provider.CsvItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.datasource.DatasourcePackage;
import org.jboss.tools.smooks.model.datasource.provider.DatasourceItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.dbrouting.DbroutingPackage;
import org.jboss.tools.smooks.model.dbrouting.provider.DbroutingItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.edi.EdiPackage;
import org.jboss.tools.smooks.model.edi.provider.EdiItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage;
-import org.jboss.tools.smooks.model.fileRouting.FileRoutingPackage;
import org.jboss.tools.smooks.model.fileRouting.provider.FileRoutingItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage;
import org.jboss.tools.smooks.model.freemarker.provider.FreemarkerItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.groovy.GroovyPackage;
import org.jboss.tools.smooks.model.groovy.provider.GroovyItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.iorouting.IoroutingPackage;
import org.jboss.tools.smooks.model.iorouting.provider.IoroutingItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.javabean.JavabeanPackage;
import org.jboss.tools.smooks.model.javabean.provider.JavabeanItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage;
import org.jboss.tools.smooks.model.jmsrouting.provider.JmsroutingItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.json.JsonPackage;
import org.jboss.tools.smooks.model.json.provider.JsonItemProviderAdapterFactory;
import org.jboss.tools.smooks.model.medi.DocumentRoot;
-import org.jboss.tools.smooks.model.medi.MEdiPackage;
import org.jboss.tools.smooks.model.medi.MappingNode;
import org.jboss.tools.smooks.model.medi.provider.MEdiItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.smooks.SmooksPackage;
import org.jboss.tools.smooks.model.smooks.SmooksResourceListType;
import org.jboss.tools.smooks.model.smooks.provider.SmooksItemProviderAdapterFactory;
-import org.jboss.tools.smooks.model.xsl.XslPackage;
import org.jboss.tools.smooks.model.xsl.provider.XslItemProviderAdapterFactory;
import org.jboss.tools.smooks10.model.smooks.util.SmooksResourceFactoryImpl;
@@ -68,36 +48,12 @@
* @author Dart (dpeng(a)redhat.com)
*
*/
-public abstract class AbstractSmooks11ModelTestCase extends TestCase {
+public abstract class AbstractSmooks11ModelTestCase extends BaseTestCase {
protected ComposedAdapterFactory adapterFactory;
protected AdapterFactoryEditingDomain editingDomain;
protected EObject smooksModel;
- static {
- // regist emf model uri mapping
- Registry.INSTANCE.put(SmooksPackage.eNS_URI, SmooksPackage.eINSTANCE);
- Registry.INSTANCE.put(CalcPackage.eNS_URI, CalcPackage.eINSTANCE);
- Registry.INSTANCE.put(CommonPackage.eNS_URI, CommonPackage.eINSTANCE);
- Registry.INSTANCE.put(CsvPackage.eNS_URI, CsvPackage.eINSTANCE);
- Registry.INSTANCE.put(DatasourcePackage.eNS_URI, DatasourcePackage.eINSTANCE);
- Registry.INSTANCE.put(DbroutingPackage.eNS_URI, DbroutingPackage.eINSTANCE);
- Registry.INSTANCE.put(EdiPackage.eNS_URI, EdiPackage.eINSTANCE);
- Registry.INSTANCE.put(FileRoutingPackage.eNS_URI, FileRoutingPackage.eINSTANCE);
-
- Registry.INSTANCE.put(FreemarkerPackage.eNS_URI, FreemarkerPackage.eINSTANCE);
- Registry.INSTANCE.put(GroovyPackage.eNS_URI, GroovyPackage.eINSTANCE);
- Registry.INSTANCE.put(IoroutingPackage.eNS_URI, IoroutingPackage.eINSTANCE);
- Registry.INSTANCE.put(JavabeanPackage.eNS_URI, JavabeanPackage.eINSTANCE);
- Registry.INSTANCE.put(JmsroutingPackage.eNS_URI, JmsroutingPackage.eINSTANCE);
- Registry.INSTANCE.put(JsonPackage.eNS_URI, JsonPackage.eINSTANCE);
- Registry.INSTANCE.put(MEdiPackage.eNS_URI, MEdiPackage.eINSTANCE);
- Registry.INSTANCE.put(XslPackage.eNS_URI, XslPackage.eINSTANCE);
- Registry.INSTANCE.put(EsbroutingPackage.eNS_URI, EsbroutingPackage.eINSTANCE);
- Registry.INSTANCE.put(org.jboss.tools.smooks10.model.smooks.SmooksPackage.eNS_URI,
- org.jboss.tools.smooks10.model.smooks.SmooksPackage.eINSTANCE);
- }
-
public void testModel() {
// do nothing
}
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/BaseTestCase.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/BaseTestCase.java (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/BaseTestCase.java 2009-07-01 08:19:58 UTC (rev 16312)
@@ -0,0 +1,59 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.test.model11;
+
+import org.eclipse.emf.ecore.EPackage.Registry;
+import org.jboss.tools.smooks.model.calc.CalcPackage;
+import org.jboss.tools.smooks.model.common.CommonPackage;
+import org.jboss.tools.smooks.model.csv.CsvPackage;
+import org.jboss.tools.smooks.model.datasource.DatasourcePackage;
+import org.jboss.tools.smooks.model.dbrouting.DbroutingPackage;
+import org.jboss.tools.smooks.model.edi.EdiPackage;
+import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage;
+import org.jboss.tools.smooks.model.fileRouting.FileRoutingPackage;
+import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage;
+import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtPackage;
+import org.jboss.tools.smooks.model.groovy.GroovyPackage;
+import org.jboss.tools.smooks.model.iorouting.IoroutingPackage;
+import org.jboss.tools.smooks.model.javabean.JavabeanPackage;
+import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage;
+import org.jboss.tools.smooks.model.json.JsonPackage;
+import org.jboss.tools.smooks.model.medi.MEdiPackage;
+import org.jboss.tools.smooks.model.smooks.SmooksPackage;
+import org.jboss.tools.smooks.model.xsl.XslPackage;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Dart
+ *
+ */
+public class BaseTestCase extends TestCase {
+ static {
+ // regist emf model uri mapping
+ Registry.INSTANCE.put(SmooksGraphicsExtPackage.eNS_URI, SmooksGraphicsExtPackage.eINSTANCE);
+ Registry.INSTANCE.put(SmooksPackage.eNS_URI, SmooksPackage.eINSTANCE);
+ Registry.INSTANCE.put(CalcPackage.eNS_URI, CalcPackage.eINSTANCE);
+ Registry.INSTANCE.put(CommonPackage.eNS_URI, CommonPackage.eINSTANCE);
+ Registry.INSTANCE.put(CsvPackage.eNS_URI, CsvPackage.eINSTANCE);
+ Registry.INSTANCE.put(DatasourcePackage.eNS_URI, DatasourcePackage.eINSTANCE);
+ Registry.INSTANCE.put(DbroutingPackage.eNS_URI, DbroutingPackage.eINSTANCE);
+ Registry.INSTANCE.put(EdiPackage.eNS_URI, EdiPackage.eINSTANCE);
+ Registry.INSTANCE.put(FileRoutingPackage.eNS_URI, FileRoutingPackage.eINSTANCE);
+
+ Registry.INSTANCE.put(FreemarkerPackage.eNS_URI, FreemarkerPackage.eINSTANCE);
+ Registry.INSTANCE.put(GroovyPackage.eNS_URI, GroovyPackage.eINSTANCE);
+ Registry.INSTANCE.put(IoroutingPackage.eNS_URI, IoroutingPackage.eINSTANCE);
+ Registry.INSTANCE.put(JavabeanPackage.eNS_URI, JavabeanPackage.eINSTANCE);
+ Registry.INSTANCE.put(JmsroutingPackage.eNS_URI, JmsroutingPackage.eINSTANCE);
+ Registry.INSTANCE.put(JsonPackage.eNS_URI, JsonPackage.eINSTANCE);
+ Registry.INSTANCE.put(MEdiPackage.eNS_URI, MEdiPackage.eINSTANCE);
+ Registry.INSTANCE.put(XslPackage.eNS_URI, XslPackage.eINSTANCE);
+ Registry.INSTANCE.put(EsbroutingPackage.eNS_URI, EsbroutingPackage.eINSTANCE);
+ Registry.INSTANCE.put(org.jboss.tools.smooks10.model.smooks.SmooksPackage.eNS_URI,
+ org.jboss.tools.smooks10.model.smooks.SmooksPackage.eINSTANCE);
+ }
+ public void testNull(){//ignore
+ }
+}
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/BaseTestCase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 8 months
JBoss Tools SVN: r16311 - in trunk/smooks/plugins: org.jboss.tools.smooks.ui/META-INF and 7 other directories.
by jbosstools-commits@lists.jboss.org
Author: DartPeng
Date: 2009-07-01 04:15:24 -0400 (Wed, 01 Jul 2009)
New Revision: 16311
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/JsonInputDataParser.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLObjectAnalyzer2.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ExtentionInputLabelProvider.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectoreSelectionDialog.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/StructuredDataSelectionWizardDailog.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanStrucutredDataWizard.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataConfiguraitonWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataWizard.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposalProvider.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/IStructuredDataSelectionWizard.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/TransformDataWizardSelectionPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLStructuredDataWizard.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDStructuredDataWizard.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java
Log:
JBIDE-4540
1.New JsonReader element via Json configuration page
2.Record the config information in graphical ext file.
3.Generate the "selector" with Json input data.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -484,7 +484,7 @@
public static String getInputPath(InputType input) {
List<org.jboss.tools.smooks.model.graphics.ext.ParamType> list = input.getParam();
if (INPUT_TYPE_JAVA.equals(input.getType()) || INPUT_TYPE_XML.equals(input.getType())
- || INPUT_TYPE_XSD.equals(input.getType())) {
+ || INPUT_TYPE_XSD.equals(input.getType()) || INPUT_TYPE_JSON.equals(input.getType())) {
for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) {
org.jboss.tools.smooks.model.graphics.ext.ParamType paramType = (org.jboss.tools.smooks.model.graphics.ext.ParamType) iterator
.next();
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 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2009-07-01 08:15:24 UTC (rev 16311)
@@ -32,3 +32,7 @@
Bundle-Vendor: %providerName
Bundle-ClassPath: libs/dom4j-1.6.1.jar,
.
+Export-Package: org.jboss.tools.smooks.configuration.editors,
+ org.jboss.tools.smooks.configuration.editors.javabean,
+ org.jboss.tools.smooks.configuration.editors.uitls,
+ org.jboss.tools.smooks.configuration.editors.xml
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ExtentionInputLabelProvider.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ExtentionInputLabelProvider.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ExtentionInputLabelProvider.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -75,7 +75,7 @@
List<ParamType> paramers = ((InputType) element).getParam();
for (Iterator<?> iterator = paramers.iterator(); iterator.hasNext();) {
ParamType paramType = (ParamType) iterator.next();
- if ("path".equals(paramType.getName())) {
+ if ("path".equalsIgnoreCase(paramType.getName())) {
continue;
}
extValue += paramType.getName() + "=" + paramType.getValue() + ",";
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectoreSelectionDialog.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectoreSelectionDialog.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectoreSelectionDialog.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -45,6 +45,7 @@
import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
import org.jboss.tools.smooks.configuration.editors.javabean.JavaBeanModel;
import org.jboss.tools.smooks.configuration.editors.javabean.JavaBeanModelFactory;
+import org.jboss.tools.smooks.configuration.editors.uitls.JsonInputDataParser;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
import org.jboss.tools.smooks.configuration.editors.wizard.StructuredDataSelectionWizard;
import org.jboss.tools.smooks.configuration.editors.xml.AbstractXMLObject;
@@ -54,6 +55,8 @@
import org.jboss.tools.smooks.model.graphics.ext.InputType;
import org.jboss.tools.smooks.model.graphics.ext.ParamType;
import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType;
+import org.jboss.tools.smooks.model.smooks.DocumentRoot;
+import org.jboss.tools.smooks.model.smooks.SmooksResourceListType;
import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils;
/**
@@ -237,7 +240,8 @@
});
}
- public static List<Object> generateInputData(SmooksGraphicsExtType extType) {
+ public static List<Object> generateInputData(SmooksGraphicsExtType extType,
+ SmooksResourceListType smooksResourceListType) {
List<Object> list = new ArrayList<Object>();
if (extType != null) {
IJavaProject project = SmooksUIUtils.getJavaProject(extType);
@@ -249,6 +253,21 @@
String path = SmooksModelUtils.getInputPath(inputType);
if (type != null && path != null) {
path = path.trim();
+ if (SmooksModelUtils.INPUT_TYPE_JSON.equals(type)) {
+ try {
+ JsonInputDataParser parser = new JsonInputDataParser();
+ IXMLStructuredObject tagList = parser.parseJsonFile(SmooksUIUtils.parseFilePath(path),
+ inputType, smooksResourceListType);
+ if (tagList instanceof TagList) {
+ list.addAll(((TagList) tagList).getChildren());
+ } else {
+ list.add(tagList);
+ }
+ } catch (Throwable tt) {
+ // ignore
+// SmooksConfigurationActivator.getDefault().log(tt);
+ }
+ }
if (SmooksModelUtils.INPUT_TYPE_JAVA.equals(type)) {
try {
Class<?> clazz = SmooksUIUtils.loadClass(path, project);
@@ -291,12 +310,7 @@
AbstractXMLObject model = new XMLObjectAnalyzer().analyze(path, null);
if (model != null) {
if (model instanceof TagList) {
- List<IXMLStructuredObject> children = ((TagList) model).getChildren();
- for (Iterator<?> iterator2 = children.iterator(); iterator2.hasNext();) {
- IXMLStructuredObject structuredObject = (IXMLStructuredObject) iterator2
- .next();
- list.add(structuredObject);
- }
+ list.addAll(((TagList) model).getChildren());
} else {
list.add(model);
}
@@ -315,7 +329,12 @@
}
protected List<Object> generateInputData() {
- return generateInputData(graphicsExt);
+ Object obj = ((SmooksMultiFormEditor) editorPart).getSmooksModel();
+ SmooksResourceListType resourceList = null;
+ if (obj instanceof DocumentRoot) {
+ resourceList = ((DocumentRoot) obj).getSmooksResourceList();
+ }
+ return generateInputData(graphicsExt, resourceList);
}
protected void showInputDataWizard() {
@@ -326,8 +345,12 @@
}
wizard.setForcePreviousAndNextButtons(true);
+ SmooksMultiFormEditor formEditor = null;
+ if (this.editorPart != null && this.editorPart instanceof SmooksMultiFormEditor) {
+ formEditor = (SmooksMultiFormEditor) editorPart;
+ }
StructuredDataSelectionWizardDailog dialog = new StructuredDataSelectionWizardDailog(this.getShell(), wizard,
- this.graphicsExt);
+ this.graphicsExt, formEditor);
if (dialog.show() == WizardDialog.OK) {
List<Object> input = this.generateInputData();
this.viewer.setInput(input);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -216,7 +216,7 @@
wizard.setSite(getEditorSite());
wizard.setForcePreviousAndNextButtons(true);
StructuredDataSelectionWizardDailog dialog = new StructuredDataSelectionWizardDailog(
- getEditorSite().getShell(), wizard , getSmooksGraphicsExtType());
+ getEditorSite().getShell(), wizard , getSmooksGraphicsExtType(),(SmooksMultiFormEditor)getEditor());
dialog.show();
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/StructuredDataSelectionWizardDailog.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/StructuredDataSelectionWizardDailog.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/StructuredDataSelectionWizardDailog.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -38,10 +38,13 @@
protected SmooksGraphicsExtType smooksGraphicsExtType;
+ private SmooksMultiFormEditor formEditor;
+
public StructuredDataSelectionWizardDailog(Shell parentShell,
- IWizard newWizard,SmooksGraphicsExtType extType) {
+ IWizard newWizard,SmooksGraphicsExtType extType , SmooksMultiFormEditor formEditor) {
super(parentShell, newWizard);
this.setSmooksGraphicsExtType(extType);
+ this.formEditor = formEditor;
}
public IStructuredDataSelectionWizard getCurrentCreationWizard(){
@@ -53,7 +56,14 @@
}
-
+ public SmooksMultiFormEditor getFormEditor() {
+ return formEditor;
+ }
+
+ public void setFormEditor(SmooksMultiFormEditor formEditor) {
+ this.formEditor = formEditor;
+ }
+
/**
* @return the smooksGraphicsExtType
*/
@@ -91,9 +101,15 @@
IStructuredDataSelectionWizard wizard1 = this.getCurrentCreationWizard();
String type = wizard1.getInputDataTypeID();
String path = wizard1.getStructuredDataSourcePath();
+
+ wizard1.complate(this.getFormEditor());
+
SmooksGraphicsExtType extType = getSmooksGraphicsExtType();
if (type != null && path != null && extType != null) {
String[] values = path.split(";");
+ if(values == null || values.length == 0){
+ values = new String[]{path};
+ }
for (int i = 0; i < values.length; i++) {
String value = values[i];
value = value.trim();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanStrucutredDataWizard.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanStrucutredDataWizard.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanStrucutredDataWizard.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -28,6 +28,7 @@
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
+import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.configuration.editors.wizard.IStructuredDataSelectionWizard;
import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils;
@@ -181,4 +182,9 @@
}
return buffer.toString();
}
+
+ public void complate(SmooksMultiFormEditor formEditor) {
+ // TODO Auto-generated method stub
+
+ }
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataConfiguraitonWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataConfiguraitonWizardPage.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataConfiguraitonWizardPage.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -11,14 +11,14 @@
package org.jboss.tools.smooks.configuration.editors.json;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ICellModifier;
import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.TableViewer;
@@ -28,10 +28,14 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.Text;
@@ -54,8 +58,6 @@
private String nullValueReplacement = "";
- private Map<String, String> keyMap;
-
private String encoding = "UTF-8";
private Text rootNameText;
@@ -76,9 +78,19 @@
private ArrayList<KeyValueModel> keyValueList;
+ private Button addButton;
+
+ private Button removeButton;
+
+ private Button createJsonReaderButton;
+
+ protected boolean createJsonReader = true;
+
private void initValue() {
rootName = null;
+ createJsonReader = true;
+
arrayElementName = "element";
keyWhitspaceReplacement = "-";
@@ -87,14 +99,13 @@
illegalElementNameCharReplacement = null;
nullValueReplacement = "";
- keyMap = new HashMap<String, String>();
encoding = "UTF-8";
- keyValueList = new ArrayList<KeyValueModel>();
-
- keyValueList.add(new KeyValueModel("ket", "aaaa"));
- keyValueList.add(new KeyValueModel("12", "4"));
- keyValueList.add(new KeyValueModel("fg", "1a"));
- keyValueList.add(new KeyValueModel("g", "y4"));
+ if (keyValueList != null) {
+ keyValueList.clear();
+ } else {
+ keyValueList = new ArrayList<KeyValueModel>();
+ }
+
}
/*
@@ -116,12 +127,6 @@
mainComposite.setLayoutData(gd);
gd = new GridData(GridData.FILL_HORIZONTAL);
- /**
- * String rootName, String arrayElementName, String
- * keyWhitspaceReplacement, String keyPrefixOnNumeric, String
- * illegalElementNameCharReplacement, String nullValueReplacement,
- * Map<String, String> keyMap, String encoding
- */
Label rootnameLabel = new Label(mainComposite, SWT.NONE);
rootnameLabel.setText("Root Element Name");
rootNameText = new Text(mainComposite, SWT.BORDER);
@@ -173,58 +178,174 @@
gd.horizontalSpan = 2;
keyMapLabel.setLayoutData(gd);
- keyMapViewer = new TableViewer(mainComposite, SWT.BORDER);
-
gd = new GridData(GridData.FILL_BOTH);
gd.horizontalSpan = 2;
+
+ Composite keyMapComposite = new Composite(mainComposite, SWT.NONE);
+ keyMapComposite.setLayoutData(gd);
+
+ GridLayout kgl = new GridLayout();
+ kgl.numColumns = 2;
+ keyMapComposite.setLayout(kgl);
+
+ gd = new GridData(GridData.FILL_BOTH);
+
+ keyMapViewer = new TableViewer(keyMapComposite, SWT.BORDER | SWT.MULTI);
keyMapViewer.getControl().setLayoutData(gd);
keyMapViewer.getTable().setHeaderVisible(true);
keyMapViewer.getTable().setLinesVisible(true);
keyMapViewer.setContentProvider(new KeyMapContentProvider());
keyMapViewer.setLabelProvider(new KeyMapLabelProvider());
- keyMapViewer.setInput(keyValueList);
-
- CellEditor keyCellEditor = new TextCellEditor(keyMapViewer.getTable(),SWT.BORDER);
-
- CellEditor valueCellEditor = new TextCellEditor(keyMapViewer.getTable(),SWT.BORDER);
-
-
- keyMapViewer.setCellEditors(new CellEditor[]{keyCellEditor,valueCellEditor});
-
- keyMapViewer.setColumnProperties(new String[]{"key","value"});
-
+
+ CellEditor keyCellEditor = new TextCellEditor(keyMapViewer.getTable(),
+ SWT.BORDER);
+
+ CellEditor valueCellEditor = new TextCellEditor(
+ keyMapViewer.getTable(), SWT.BORDER);
+
+ keyMapViewer.setCellEditors(new CellEditor[] { keyCellEditor,
+ valueCellEditor });
+
+ keyMapViewer.setColumnProperties(new String[] { "key", "value" });
+
keyMapViewer.setCellModifier(new ICellModifier() {
-
+
public void modify(Object element, String property, Object value) {
- // TODO Auto-generated method stub
-
+ Object el = null;
+ if (element instanceof Item) {
+ el = ((Item) element).getData();
+ }
+ if (el == null)
+ return;
+ if (el instanceof KeyValueModel && value instanceof String) {
+ if (property.equals("key")) {
+ ((KeyValueModel) el).setKey(value.toString());
+ }
+ if (property.equals("value")) {
+ ((KeyValueModel) el).setValue(value.toString());
+ }
+ keyMapViewer.refresh(el);
+ }
}
-
+
public Object getValue(Object element, String property) {
- // TODO Auto-generated method stub
- return "ggg";
+ // Object el = null;
+ // if(element instanceof Item){
+ // el = ((Item)element).getData();
+ // }
+ // if(el == null) return null;
+ if (element instanceof KeyValueModel) {
+ if (property.equals("key")) {
+ return ((KeyValueModel) element).getKey();
+ }
+ if (property.equals("value")) {
+ return ((KeyValueModel) element).getValue();
+ }
+ }
+
+ return null;
}
-
+
public boolean canModify(Object element, String property) {
- return true;
+ // Object el = null;
+ // if(element instanceof Item){
+ // el = ((Item)element).getData();
+ // }
+ // if(el == null) return false;
+ if (element instanceof KeyValueModel) {
+ if (property.equals("key") || property.equals("value")) {
+ return true;
+ }
+ }
+ return false;
}
});
-
+
TableColumn keyColumn = new TableColumn(keyMapViewer.getTable(),
- SWT.NONE);
+ SWT.BORDER);
keyColumn.setWidth(150);
keyColumn.setText("Key");
+
TableColumn replaceColumn = new TableColumn(keyMapViewer.getTable(),
- SWT.NONE);
+ SWT.BORDER);
replaceColumn.setWidth(150);
replaceColumn.setText("Replace");
+ keyMapViewer.setInput(keyValueList);
+
+ Composite buttonComposite = new Composite(keyMapComposite, SWT.NONE);
+ gd = new GridData(GridData.FILL_VERTICAL);
+ buttonComposite.setLayoutData(gd);
+
+ GridLayout bgl = new GridLayout();
+ buttonComposite.setLayout(bgl);
+
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+
+ addButton = new Button(buttonComposite, SWT.BORDER);
+ addButton.setLayoutData(gd);
+ addButton.setText("Add");
+
+ removeButton = new Button(buttonComposite, SWT.BORDER);
+ removeButton.setLayoutData(gd);
+ removeButton.setText("Remove");
+
+ createJsonReaderButton = new Button(mainComposite, SWT.CHECK);
+ createJsonReaderButton.setText("Create a JSON Reader");
+
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 2;
+ createJsonReaderButton.setLayoutData(gd);
+ createJsonReaderButton.setSelection(true);
hookControls();
changePageStatus();
this.setControl(mainComposite);
}
private void hookControls() {
+
+ addButton.addSelectionListener(new SelectionListener() {
+
+ public void widgetSelected(SelectionEvent e) {
+ keyValueList.add(new KeyValueModel("key", "value"));
+ keyMapViewer.refresh();
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+
+ removeButton.addSelectionListener(new SelectionListener() {
+
+ public void widgetSelected(SelectionEvent e) {
+ IStructuredSelection selection = (IStructuredSelection) keyMapViewer
+ .getSelection();
+ List<?> selections = selection.toList();
+ for (Iterator<?> iterator = selections.iterator(); iterator
+ .hasNext();) {
+ Object object = (Object) iterator.next();
+ keyValueList.remove(object);
+ }
+ keyMapViewer.refresh();
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+ });
+
+ createJsonReaderButton.addSelectionListener(new SelectionListener() {
+
+ public void widgetSelected(SelectionEvent e) {
+ createJsonReader = createJsonReaderButton.getSelection();
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+
+ }
+ });
+
encodingText.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -369,14 +490,14 @@
this.nullValueReplacement = nullValueReplacement;
}
- public Map<String, String> getKeyMap() {
- return keyMap;
- }
+// public Map<String, String> getKeyMap() {
+// return keyMap;
+// }
+//
+// public void setKeyMap(Map<String, String> keyMap) {
+// this.keyMap = keyMap;
+// }
- public void setKeyMap(Map<String, String> keyMap) {
- this.keyMap = keyMap;
- }
-
public String getEncoding() {
return encoding;
}
@@ -384,67 +505,88 @@
public void setEncoding(String encoding) {
this.encoding = encoding;
}
-
-
- private class KeyMapLabelProvider extends LabelProvider implements ITableLabelProvider{
+ public ArrayList<KeyValueModel> getKeyValueList() {
+ return keyValueList;
+ }
+
+ public void setKeyValueList(ArrayList<KeyValueModel> keyValueList) {
+ this.keyValueList = keyValueList;
+ }
+
+ public boolean isCreateJsonReader() {
+ return createJsonReader;
+ }
+
+ public void setCreateJsonReader(boolean createJsonReader) {
+ this.createJsonReader = createJsonReader;
+ }
+
+
+
+ private class KeyMapLabelProvider extends LabelProvider implements
+ ITableLabelProvider {
+
public Image getColumnImage(Object element, int columnIndex) {
return null;
}
public String getColumnText(Object element, int columnIndex) {
-// if(element instanceof KeyValueModel){
-// switch(columnIndex){
-// case 0:
-// return ((KeyValueModel)element).getKey();
-// case 1:
-// return ((KeyValueModel)element).getValue();
-// }
-// }
+ if (element instanceof KeyValueModel) {
+ switch (columnIndex) {
+ case 0:
+ return ((KeyValueModel) element).getKey();
+ case 1:
+ return ((KeyValueModel) element).getValue();
+ }
+ }
return getText(element);
}
-
+
}
-
- private class KeyMapContentProvider implements IStructuredContentProvider{
+ private class KeyMapContentProvider implements IStructuredContentProvider {
+
public Object[] getElements(Object inputElement) {
- if(inputElement instanceof List<?>){
- return ((List<?>)inputElement).toArray();
+ if (inputElement instanceof List<?>) {
+ return ((List<?>) inputElement).toArray();
}
// TODO Auto-generated method stub
- return new Object[]{};
+ return new Object[] {};
}
public void dispose() {
-
+
}
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
// TODO Auto-generated method stub
-
+
}
-
+
}
-
- private class KeyValueModel{
+
+ public class KeyValueModel {
private String key;
private String value;
-
- public KeyValueModel(String key , String value){
+
+ public KeyValueModel(String key, String value) {
this.key = key;
this.value = value;
}
-
+
public String getKey() {
return key;
}
+
public void setKey(String key) {
this.key = key;
}
+
public String getValue() {
return value;
}
+
public void setValue(String value) {
this.value = value;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataWizard.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataWizard.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataWizard.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -10,15 +10,29 @@
******************************************************************************/
package org.jboss.tools.smooks.configuration.editors.json;
+import java.util.Iterator;
+import java.util.List;
import java.util.Properties;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.AddCommand;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
+import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
+import org.jboss.tools.smooks.configuration.editors.json.JsonDataConfiguraitonWizardPage.KeyValueModel;
+import org.jboss.tools.smooks.configuration.editors.uitls.JsonInputDataParser;
import org.jboss.tools.smooks.configuration.editors.wizard.IStructuredDataSelectionWizard;
+import org.jboss.tools.smooks.model.json.JsonFactory;
+import org.jboss.tools.smooks.model.json.JsonReader;
+import org.jboss.tools.smooks.model.json.Key;
+import org.jboss.tools.smooks.model.json.KeyMap;
+import org.jboss.tools.smooks.model.smooks.DocumentRoot;
+import org.jboss.tools.smooks.model.smooks.SmooksPackage;
+import org.jboss.tools.smooks.model.smooks.SmooksResourceListType;
import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils;
/**
@@ -73,7 +87,7 @@
@Override
public boolean performFinish() {
// TODO Auto-generated method stub
- return false;
+ return true;
}
/*
@@ -112,39 +126,56 @@
private void fillProperties(Properties p) {
if (configPage != null) {
+
+ boolean createJsonReader = configPage.isCreateJsonReader();
+
+ if (createJsonReader) {
+ p.setProperty(JsonInputDataParser.LINK_JSON_READER, "true");
+ return;
+ }
+
+ List<KeyValueModel> keyMapList = configPage.getKeyValueList();
+ for (Iterator<?> iterator = keyMapList.iterator(); iterator
+ .hasNext();) {
+ KeyValueModel keyValueModel = (KeyValueModel) iterator.next();
+ String key = keyValueModel.getKey();
+ String value = keyValueModel.getValue();
+ p.setProperty(JsonInputDataParser.KEY + key, value);
+ }
+
String aen = configPage.getArrayElementName();
if (aen != null && aen.length() != 0) {
- p.setProperty("arrayElementName", aen);
+ p.setProperty(JsonInputDataParser.ARRAY_ELEMENT_NAME, aen);
}
String rn = configPage.getRootName();
if (rn != null && rn.length() != 0) {
- p.setProperty("rootName", rn);
+ p.setProperty(JsonInputDataParser.ROOT_NAME, rn);
}
String encoding = configPage.getEncoding();
if (encoding != null && encoding.length() != 0) {
- p.setProperty("encoding", encoding);
+ p.setProperty(JsonInputDataParser.ENCODING2, encoding);
}
String sr = configPage.getKeyWhitspaceReplacement();
if (sr != null && sr.length() != 0) {
- p.setProperty("spaceReplace", sr);
+ p.setProperty(JsonInputDataParser.SPACE_REPLACE, sr);
}
String pon = configPage.getKeyPrefixOnNumeric();
if (pon != null && pon.length() != 0) {
- p.setProperty("prefixOnNumeric", pon);
+ p.setProperty(JsonInputDataParser.PREFIX_ON_NUMERIC, pon);
}
String nvr = configPage.getNullValueReplacement();
if (nvr != null && nvr.length() != 0) {
- p.setProperty("nullReplace", nvr);
+ p.setProperty(JsonInputDataParser.NULL_REPLACE, nvr);
}
String ier = configPage.getIllegalElementNameCharReplacement();
if (ier != null && ier.length() != 0) {
- p.setProperty("illegalReplace", ier);
+ p.setProperty(JsonInputDataParser.ILLEGAL_REPLACE, ier);
}
}
}
@@ -183,4 +214,77 @@
public void init(IEditorSite site, IEditorInput input) {
}
+
+ public void complate(SmooksMultiFormEditor formEditor) {
+ if (configPage != null && configPage.isCreateJsonReader()) {
+ List<KeyValueModel> keyMapList = configPage.getKeyValueList();
+
+ JsonReader reader = JsonFactory.eINSTANCE.createJsonReader();
+ if (keyMapList != null && !keyMapList.isEmpty()) {
+ KeyMap map = JsonFactory.eINSTANCE.createKeyMap();
+ for (Iterator<?> iterator = keyMapList.iterator(); iterator
+ .hasNext();) {
+ KeyValueModel keyValueModel = (KeyValueModel) iterator
+ .next();
+ String key = keyValueModel.getKey();
+ String value = keyValueModel.getValue();
+ Key k = JsonFactory.eINSTANCE.createKey();
+ k.setFrom(key);
+ k.setTo(value);
+ map.getKey().add(k);
+ }
+ reader.setKeyMap(map);
+ }
+
+ String aen = configPage.getArrayElementName();
+ if (aen != null && aen.length() != 0) {
+ reader.setArrayElementName(aen);
+ }
+
+ String rn = configPage.getRootName();
+ if (rn != null && rn.length() != 0) {
+ reader.setRootName(rn);
+ }
+
+ String encoding = configPage.getEncoding();
+ if (encoding != null && encoding.length() != 0) {
+ reader.setEncoding(encoding);
+ }
+
+ String sr = configPage.getKeyWhitspaceReplacement();
+ if (sr != null && sr.length() != 0) {
+ reader.setKeyWhitspaceReplacement(sr);
+ }
+
+ String pon = configPage.getKeyPrefixOnNumeric();
+ if (pon != null && pon.length() != 0) {
+ reader.setKeyPrefixOnNumeric(pon);
+ }
+
+ String nvr = configPage.getNullValueReplacement();
+ if (nvr != null && nvr.length() != 0) {
+ reader.setNullValueReplacement(nvr);
+ }
+
+ String ier = configPage.getIllegalElementNameCharReplacement();
+ if (ier != null && ier.length() != 0) {
+ reader.setIllegalElementNameCharReplacement(ier);
+ }
+
+ SmooksResourceListType resourceList = null;
+ Object smooksModel = formEditor.getSmooksModel();
+ if (smooksModel instanceof DocumentRoot) {
+ resourceList = ((DocumentRoot) smooksModel)
+ .getSmooksResourceList();
+ }
+ Command command = AddCommand
+ .create(
+ formEditor.getEditingDomain(),
+ resourceList,
+ SmooksPackage.eINSTANCE
+ .getSmooksResourceListType_AbstractReader(),
+ reader);
+ formEditor.getEditingDomain().getCommandStack().execute(command);
+ }
+ }
}
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/JsonInputDataParser.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/JsonInputDataParser.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/JsonInputDataParser.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -0,0 +1,271 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.configuration.editors.uitls;
+
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.dom4j.DocumentException;
+import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject;
+import org.jboss.tools.smooks.configuration.editors.xml.TagList;
+import org.jboss.tools.smooks.configuration.editors.xml.XMLObjectAnalyzer;
+import org.jboss.tools.smooks.model.graphics.ext.InputType;
+import org.jboss.tools.smooks.model.graphics.ext.ParamType;
+import org.jboss.tools.smooks.model.json.JsonReader;
+import org.jboss.tools.smooks.model.json.Key;
+import org.jboss.tools.smooks.model.json.KeyMap;
+import org.jboss.tools.smooks.model.smooks.AbstractReader;
+import org.jboss.tools.smooks.model.smooks.SmooksResourceListType;
+import org.milyn.Smooks;
+import org.milyn.SmooksUtil;
+import org.milyn.cdr.Parameter;
+import org.milyn.cdr.SmooksResourceConfiguration;
+import org.milyn.json.JSONReader;
+import org.milyn.xml.XmlUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * @author Dart
+ *
+ */
+public class JsonInputDataParser {
+
+ public static final String LINK_JSON_READER = "linkJSONReader";
+ public static final String KEY = "_key_";
+ public static final String NULL_REPLACE = "nullReplace";
+ public static final String ENCODING2 = "encoding";
+ public static final String SPACE_REPLACE = "spaceReplace";
+ public static final String PREFIX_ON_NUMERIC = "prefixOnNumeric";
+ public static final String ILLEGAL_REPLACE = "illegalReplace";
+ public static final String ARRAY_ELEMENT_NAME = "arrayElementName";
+ public static final String ROOT_NAME = "rootName";
+
+ public IXMLStructuredObject parseJsonFile(InputStream inputStream, JsonReader reader)
+ throws ParserConfigurationException, DocumentException {
+ String rootName = null;
+ String arrayElementName = null;
+ String keyWhitspaceReplacement = null;
+ String keyPrefixOnNumeric = null;
+ String illegalElementNameCharReplacement = null;
+ String nullValueReplacement = null;
+ String encoding = null;
+ Map<String, String> keyMap = new HashMap<String, String>();
+ if (reader == null)
+ return null;
+ rootName = reader.getRootName();
+ arrayElementName = reader.getArrayElementName();
+ keyPrefixOnNumeric = reader.getKeyPrefixOnNumeric();
+ keyWhitspaceReplacement = reader.getKeyWhitspaceReplacement();
+ illegalElementNameCharReplacement = reader.getIllegalElementNameCharReplacement();
+ nullValueReplacement = reader.getNullValueReplacement();
+ encoding = reader.getEncoding();
+ KeyMap km = reader.getKeyMap();
+ if (km != null) {
+ List<Key> keyList = km.getKey();
+ for (Iterator<?> iterator = keyList.iterator(); iterator.hasNext();) {
+ Key key = (Key) iterator.next();
+ keyMap.put(key.getFrom(), key.getTo());
+ }
+ }
+ return this.parseJsonFile(inputStream, rootName, arrayElementName, keyWhitspaceReplacement, keyPrefixOnNumeric,
+ illegalElementNameCharReplacement, nullValueReplacement, keyMap, encoding);
+ }
+
+ public IXMLStructuredObject parseJsonFile(InputStream stream, InputType inputType,
+ SmooksResourceListType resourceList) throws FileNotFoundException, ParserConfigurationException,
+ DocumentException, InvocationTargetException {
+ List<ParamType> paramList = inputType.getParam();
+ String rootName = null;
+ String arrayElementName = null;
+ String keyWhitspaceReplacement = null;
+ String keyPrefixOnNumeric = null;
+ String illegalElementNameCharReplacement = null;
+ String nullValueReplacement = null;
+ String encoding = null;
+ Map<String, String> keyMap = new HashMap<String, String>();
+
+ for (Iterator<?> iterator = paramList.iterator(); iterator.hasNext();) {
+ ParamType paramType = (ParamType) iterator.next();
+ if (paramType.getName().equals(LINK_JSON_READER)) {
+ if (paramType.getValue().equalsIgnoreCase("true") && resourceList != null) {
+ List<AbstractReader> readers = resourceList.getAbstractReader();
+ int count = 0;
+ int index = -1;
+ for (Iterator<?> iterator2 = readers.iterator(); iterator2.hasNext();) {
+ AbstractReader abstractReader = (AbstractReader) iterator2.next();
+ if (abstractReader instanceof JsonReader) {
+ count++;
+ if (index == -1) {
+ index = readers.indexOf(abstractReader);
+ }
+ }
+ }
+
+ if (count > 1) {
+ // throw new
+ // RuntimeException("The smooks config file should have only one JSON reader");
+ }
+ if (index != -1) {
+ return parseJsonFile(stream, (JsonReader) readers.get(index));
+ }
+
+ }
+ }
+ if (paramType.getName().equals(ROOT_NAME)) {
+ rootName = paramType.getValue();
+ }
+ if (paramType.getName().startsWith(KEY)) {
+ String name = paramType.getName().substring(KEY.length(), paramType.getName().length());
+ String value = paramType.getValue();
+ keyMap.put(name, value);
+ }
+ if (paramType.getName().equals(ARRAY_ELEMENT_NAME)) {
+ arrayElementName = paramType.getValue();
+ }
+ if (paramType.getName().equals(ILLEGAL_REPLACE)) {
+ illegalElementNameCharReplacement = paramType.getValue();
+ }
+ if (paramType.getName().equals(PREFIX_ON_NUMERIC)) {
+ keyPrefixOnNumeric = paramType.getValue();
+ }
+ if (paramType.getName().equals(SPACE_REPLACE)) {
+ keyWhitspaceReplacement = paramType.getValue();
+ }
+ if (paramType.getName().equals(ENCODING2)) {
+ encoding = paramType.getValue();
+ }
+ if (paramType.getName().equals(NULL_REPLACE)) {
+ nullValueReplacement = paramType.getValue();
+ }
+ }
+
+ return this.parseJsonFile(stream, rootName, arrayElementName, keyWhitspaceReplacement, keyPrefixOnNumeric,
+ illegalElementNameCharReplacement, nullValueReplacement, keyMap, encoding);
+ }
+
+ public IXMLStructuredObject parseJsonFile(String filePath, InputType inputType, SmooksResourceListType resourceList)
+ throws FileNotFoundException, ParserConfigurationException, DocumentException, InvocationTargetException {
+ FileInputStream stream = new FileInputStream(filePath);
+ return this.parseJsonFile(stream, inputType, resourceList);
+ }
+
+ public IXMLStructuredObject parseJsonFile(String filePath, String rootName, String arrayElementName,
+ String keyWhitspaceReplacement, String keyPrefixOnNumeric, String illegalElementNameCharReplacement,
+ String nullValueReplacement, Map<String, String> keyMap, String encoding) throws FileNotFoundException,
+ ParserConfigurationException, DocumentException, InvocationTargetException {
+ return this.parseJsonFile(new FileInputStream(SmooksUIUtils.parseFilePath(filePath)), rootName,
+ arrayElementName, keyWhitspaceReplacement, keyPrefixOnNumeric, illegalElementNameCharReplacement,
+ nullValueReplacement, keyMap, encoding);
+ }
+
+ public IXMLStructuredObject parseJsonFile(InputStream inputStream, String rootName, String arrayElementName,
+ String keyWhitspaceReplacement, String keyPrefixOnNumeric, String illegalElementNameCharReplacement,
+ String nullValueReplacement, Map<String, String> keyMap, String encoding)
+ throws ParserConfigurationException, DocumentException {
+
+ Smooks smooks = new Smooks();
+
+ SmooksResourceConfiguration readerConfig = new SmooksResourceConfiguration("org.xml.sax.driver",
+ JSONReader.class.getName());
+
+ readerConfig.setParameter(ROOT_NAME, rootName);
+ readerConfig.setParameter(ARRAY_ELEMENT_NAME, arrayElementName);
+ if (keyWhitspaceReplacement != null) {
+ readerConfig.setParameter("keyWhitspaceReplacement", keyWhitspaceReplacement);
+ }
+ if (keyPrefixOnNumeric != null) {
+ readerConfig.setParameter("keyPrefixOnNumeric", keyPrefixOnNumeric);
+ }
+ if (illegalElementNameCharReplacement != null) {
+ readerConfig.setParameter("illegalElementNameCharReplacement", illegalElementNameCharReplacement);
+ }
+ if (nullValueReplacement != null) {
+ readerConfig.setParameter("nullValueReplacement", nullValueReplacement);
+ }
+
+ if (keyMap != null) {
+ readerConfig.setParameter(keyMapToParameter(keyMap));
+ }
+
+ readerConfig.setParameter(ENCODING2, encoding);
+
+ SmooksUtil.registerResource(readerConfig, smooks);
+
+ // Use a DOM result to capture the message model for the supplied CSV
+ // message...
+ DOMResult domResult = new DOMResult();
+
+ // Filter the message through Smooks and capture the result as a DOM in
+ // the domResult instance...
+ smooks.filter(new StreamSource(inputStream), domResult);
+
+ // Get the Document object from the domResult. This is the message
+ // model!!!...
+ Document model = (Document) domResult.getNode();
+ StringWriter modelWriter = new StringWriter();
+ XmlUtil.serialize(model, true, modelWriter);
+
+ XMLObjectAnalyzer analyzer = new XMLObjectAnalyzer();
+ ByteArrayInputStream byteinputStream = new ByteArrayInputStream(modelWriter.toString().getBytes());
+ TagList tagList = analyzer.analyze(byteinputStream, null);
+
+ try {
+ if (byteinputStream != null) {
+ byteinputStream.close();
+ byteinputStream = null;
+ }
+ if (modelWriter != null) {
+ modelWriter.close();
+ modelWriter = null;
+ }
+ if (smooks != null) {
+ smooks.close();
+ smooks = null;
+ }
+ if (inputStream != null) {
+ inputStream.close();
+ inputStream = null;
+ }
+ model = null;
+ } catch (Throwable t) {
+ t.printStackTrace();
+ }
+
+ return tagList;
+ }
+
+ protected Parameter keyMapToParameter(Map<String, String> keyMap) throws ParserConfigurationException {
+ Parameter keyMapParam = new Parameter("keyMap", "dummyVal");
+ DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ Element keyMapElement = docBuilder.newDocument().createElement("keyMap");
+ Set<Map.Entry<String, String>> keyMapEntries = keyMap.entrySet();
+
+ for (Map.Entry<String, String> keyMapEntry : keyMapEntries) {
+ Element keyElement = keyMapElement.getOwnerDocument().createElementNS("*", "key");
+ keyElement.setAttribute("from", keyMapEntry.getKey());
+ keyElement.setAttribute("to", keyMapEntry.getValue());
+ keyMapElement.appendChild(keyElement);
+ }
+
+ keyMapParam.setXML(keyMapElement);
+
+ return keyMapParam;
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/JsonInputDataParser.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposalProvider.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposalProvider.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposalProvider.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -19,6 +19,7 @@
import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject;
import org.jboss.tools.smooks.configuration.editors.SelectoreSelectionDialog;
import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType;
+import org.jboss.tools.smooks.model.smooks.SmooksResourceListType;
/**
* @author Dart (dpeng(a)redhat.com)
@@ -27,9 +28,12 @@
public class SelectorContentProposalProvider implements IContentProposalProvider {
private SmooksGraphicsExtType extType;
+
+ private SmooksResourceListType resourceList;
- public SelectorContentProposalProvider(SmooksGraphicsExtType extType) {
+ public SelectorContentProposalProvider(SmooksGraphicsExtType extType,SmooksResourceListType resourceList) {
this.extType = extType;
+ this.resourceList = resourceList;
}
/*
@@ -43,7 +47,7 @@
if(contents.indexOf("h") != -1){
System.out.println();
}
- List<Object> list = SelectoreSelectionDialog.generateInputData(extType);
+ List<Object> list = SelectoreSelectionDialog.generateInputData(extType,resourceList);
if(list == null || list.isEmpty()){
return new IContentProposal[]{};
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -221,23 +221,26 @@
return beanIdList;
}
- public static AttributeFieldEditPart createMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain,
- FormToolkit toolkit, Composite parent, Object model, boolean linkLabel, IHyperlinkListener listener) {
- return createMixedTextFieldEditor(label, editingdomain, toolkit, parent, model, false, 0, linkLabel, false, listener,
- null);
+ public static AttributeFieldEditPart createMixedTextFieldEditor(String label,
+ AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model,
+ boolean linkLabel, IHyperlinkListener listener) {
+ return createMixedTextFieldEditor(label, editingdomain, toolkit, parent, model, false, 0, linkLabel, false,
+ listener, null);
}
- public static AttributeFieldEditPart createMultiMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain,
- FormToolkit toolkit, Composite parent, Object model, int height, OpenEditorEditInnerContentsAction action) {
- return createMixedTextFieldEditor(label, editingdomain, toolkit, parent, model, true, height, false, false, null,
- action);
+ public static AttributeFieldEditPart createMultiMixedTextFieldEditor(String label,
+ AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, int height,
+ OpenEditorEditInnerContentsAction action) {
+ return createMixedTextFieldEditor(label, editingdomain, toolkit, parent, model, true, height, false, false,
+ null, action);
}
- public static AttributeFieldEditPart createMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain,
- FormToolkit toolkit, Composite parent, Object model, boolean multiText, int height, boolean linkLabel,
- boolean openFile, IHyperlinkListener listener, OpenEditorEditInnerContentsAction action) {
- return createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, multiText, linkLabel, openFile,
- height, listener, VALUE_TYPE_TEXT, action);
+ public static AttributeFieldEditPart createMixedTextFieldEditor(String label,
+ AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model,
+ boolean multiText, int height, boolean linkLabel, boolean openFile, IHyperlinkListener listener,
+ OpenEditorEditInnerContentsAction action) {
+ return createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, multiText, linkLabel,
+ openFile, height, listener, VALUE_TYPE_TEXT, action);
}
public static FieldMarkerWrapper createFieldEditorLabel(Composite parent, FormToolkit formToolKit,
@@ -402,7 +405,8 @@
}
public static String parseFilePath(String path) throws InvocationTargetException {
- if(path == null) return null;
+ if (path == null)
+ return null;
if (new File(path).exists()) {
return path;
}
@@ -624,7 +628,7 @@
}
if (editValue != null && valueIsSet) {
valueText.setText(editValue);
- if (editValue.length() > 0 && section != null) {
+ if (editValue.length() > 0 && section != null) {
section.setExpanded(true);
}
}
@@ -755,7 +759,8 @@
SearchComposite sc = (SearchComposite) fieldEditPart.getContentControl();
- final FieldAssistDisposer disposer = addSelectorFieldAssistToText(sc.getText(), extType);
+ final FieldAssistDisposer disposer = addSelectorFieldAssistToText(sc.getText(), extType,
+ getSmooks11ResourceListType((EObject) model));
sc.addDisposeListener(new DisposeListener() {
/*
@@ -789,8 +794,8 @@
}
if (jp != null) {
ProjectClassLoader loader = new ProjectClassLoader(jp);
- if(className.endsWith("[]")){
- className = className.substring(0,className.length() - 2);
+ if (className.endsWith("[]")) {
+ className = className.substring(0, className.length() - 2);
Class<?> clazz = loader.loadClass(className);
Object arrayInstance = Array.newInstance(clazz, 0);
clazz = arrayInstance.getClass();
@@ -1447,7 +1452,8 @@
return loadedNodes;
}
- public static FieldAssistDisposer addSelectorFieldAssistToText(Text text, SmooksGraphicsExtType extType) {
+ public static FieldAssistDisposer addSelectorFieldAssistToText(Text text, SmooksGraphicsExtType extType,
+ SmooksResourceListType resourceList) {
// Decorate the text widget with the light-bulb image denoting content
// assist
int bits = SWT.DOWN | SWT.LEFT;
@@ -1477,7 +1483,7 @@
char[] autoActivationChars = new char[] { '/' };
// Create the proposal provider
- SelectorContentProposalProvider proposalProvider = new SelectorContentProposalProvider(extType);
+ SelectorContentProposalProvider proposalProvider = new SelectorContentProposalProvider(extType, resourceList);
// Create the adapter
ContentAssistCommandAdapter adapter = new ContentAssistCommandAdapter(text, textContentAdapter,
proposalProvider, command, autoActivationChars);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/IStructuredDataSelectionWizard.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/IStructuredDataSelectionWizard.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/IStructuredDataSelectionWizard.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -15,6 +15,7 @@
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
+import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
/**
* @author Dart Peng
@@ -31,5 +32,7 @@
public Properties getProperties();
public String getStructuredDataSourcePath();
+
+ public void complate(SmooksMultiFormEditor formEditor);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/TransformDataWizardSelectionPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/TransformDataWizardSelectionPage.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/TransformDataWizardSelectionPage.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -36,6 +36,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
+import org.jboss.tools.smooks.configuration.editors.GraphicsConstants;
/**
* @author Dart Peng
@@ -183,6 +184,8 @@
return icon;
}
}
+ return SmooksConfigurationActivator.getDefault().getImageRegistry().get(
+ GraphicsConstants.IMAGE_UNKNOWN_OBJ);
}
return super.getImage(element);
}
@@ -225,7 +228,7 @@
}
public Object[] getElements(Object inputElement) {
- if (inputElement instanceof List) {
+ if (inputElement instanceof List<?>) {
return ((List<?>) inputElement).toArray();
}
return new Object[] {};
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLObjectAnalyzer2.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLObjectAnalyzer2.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLObjectAnalyzer2.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -0,0 +1,137 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.configuration.editors.xml;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.List;
+
+import org.dom4j.Attribute;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
+
+/**
+ * @author Dart
+ *
+ */
+public class XMLObjectAnalyzer2 {
+ public TagList analyze(String xmlFilePath, String[] ignoreNodeNames) throws FileNotFoundException,
+ DocumentException {
+ FileInputStream stream = new FileInputStream(xmlFilePath);
+ return this.analyze(stream, ignoreNodeNames);
+ }
+
+ public TagList analyze(InputStream stream, String[] ignoreNodeNames) throws DocumentException {
+ SAXReader reader = new SAXReader();
+ Document doc = reader.read(stream);
+ Element rootElement = doc.getRootElement();
+ TagList dco = new TagList();
+ dco.setName("Docuement");
+ dco.addRootTag(parseElement(rootElement, null, ignoreNodeNames));
+ return dco;
+ }
+
+ public TagObject analyzeFregment(InputStream stream, String[] ignoreNodeNames) throws DocumentException {
+ SAXReader reader = new SAXReader();
+ Document doc = reader.read(stream);
+ Element rootElement = doc.getRootElement();
+ return parseElement(rootElement, null, ignoreNodeNames);
+ }
+
+ protected TagObject getChildTagByName(String name, TagObject tag, String[] ignoreNodeNames) {
+ if (isIgnoreNode(name, ignoreNodeNames))
+ return null;
+ if (tag == null)
+ return null;
+ List<?> list = tag.getXMLNodeChildren();
+ for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) {
+ TagObject tagc = (TagObject) iterator.next();
+ if (tagc.getName().equals(name))
+ return tagc;
+ }
+ return null;
+ }
+
+ private boolean isIgnoreNode(Element element, String[] ignoreNodeNames) {
+ return isIgnoreNode(element.getName(), ignoreNodeNames);
+ }
+
+ // private boolean isIgnoreNode(TagObject element , String[]
+ // ignoreNodeNames){
+ // return isIgnoreNode(element.getName(), ignoreNodeNames);
+ // }
+
+ private boolean isIgnoreNode(String name, String[] ignoreNodeNames) {
+ if (ignoreNodeNames == null)
+ return false;
+ for (int i = 0; i < ignoreNodeNames.length; i++) {
+ String ignore = ignoreNodeNames[i];
+ if (ignore.trim().equalsIgnoreCase(name))
+ return true;
+ }
+ return false;
+ }
+
+ protected TagObject parseElement(Element element, TagObject parentTag, String[] ignoreNodeNames) {
+
+ if (isIgnoreNode(element, ignoreNodeNames))
+ return null;
+ boolean canAdd = false;
+ TagObject tag = getChildTagByName(element.getName(), parentTag, ignoreNodeNames);
+ if (tag == null) {
+ tag = new TagObject();
+ canAdd = true;
+ }
+ tag.setReferenceElement(element);
+ tag.setName(element.getName());
+ fillProperties(element, tag, ignoreNodeNames);
+ tag.setNamespaceURL(element.getNamespaceURI());
+ List<?> list = element.elements();
+ for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) {
+ Element childElement = (Element) iterator.next();
+ TagObject t = parseElement(childElement, tag, ignoreNodeNames);
+ if (t != null) {
+ t.setReferenceElement(childElement);
+ tag.addChildTag(t);
+ }
+ }
+ if (canAdd)
+ return tag;
+ else
+ return null;
+ }
+
+ protected boolean hasSameNameProperty(String proName, TagObject tag) {
+ List<TagPropertyObject> pros = tag.getProperties();
+ for (Iterator<TagPropertyObject> iterator = pros.iterator(); iterator.hasNext();) {
+ TagPropertyObject tp = (TagPropertyObject) iterator.next();
+ if (tp.getName().equals(proName))
+ return true;
+ }
+ return false;
+ }
+
+ protected void fillProperties(Element element, TagObject tag, String[] ignoreNodeNames) {
+ Iterator<?> it = element.attributeIterator();
+ for (Iterator<?> iterator = it; iterator.hasNext();) {
+ Attribute attr = (Attribute) iterator.next();
+ String attrName = attr.getName();
+ String value = attr.getValue();
+ if (isIgnoreNode(attrName, ignoreNodeNames))
+ continue;
+ if (hasSameNameProperty(attrName, tag)) {
+ continue;
+ }
+ TagPropertyObject pro = new TagPropertyObject();
+ pro.setName(attr.getName());
+ pro.setValue(value);
+ pro.setNamespaceURL(attr.getNamespaceURI());
+ tag.addProperty(pro);
+ }
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLObjectAnalyzer2.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLStructuredDataWizard.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLStructuredDataWizard.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLStructuredDataWizard.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -12,6 +12,7 @@
import java.util.Properties;
+import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils;
/**
@@ -49,4 +50,9 @@
public Properties getProperties() {
return properties;
}
+
+ public void complate(SmooksMultiFormEditor formEditor) {
+ // TODO Auto-generated method stub
+
+ }
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDStructuredDataWizard.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDStructuredDataWizard.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDStructuredDataWizard.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -12,6 +12,7 @@
import java.util.Properties;
+import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils;
/**
@@ -46,4 +47,9 @@
return pro;
}
+ public void complate(SmooksMultiFormEditor formEditor) {
+ // TODO Auto-generated method stub
+
+ }
+
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java 2009-07-01 08:03:17 UTC (rev 16310)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java 2009-07-01 08:15:24 UTC (rev 16311)
@@ -80,8 +80,9 @@
return super.validate(selectedObjects, editingDomain);
}
Object obj = resource.getContents().get(0);
+ SmooksResourceListType listType = null;
if (obj instanceof DocumentRoot) {
- SmooksResourceListType listType = ((DocumentRoot) obj).getSmooksResourceList();
+ listType = ((DocumentRoot) obj).getSmooksResourceList();
IResource r = SmooksUIUtils.getResource(listType);
IFile file = null;
if (r instanceof IFile) {
@@ -98,7 +99,7 @@
}
}
if (extType != null) {
- List<Object> l = SelectoreSelectionDialog.generateInputData(extType);
+ List<Object> l = SelectoreSelectionDialog.generateInputData(extType, listType);
if (l != null) {
list.addAll(l);
}
15 years, 8 months
JBoss Tools SVN: r16310 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate.hblibs/.settings and 20 other directories.
by jbosstools-commits@lists.jboss.org
Author: sflanigan
Date: 2009-07-01 04:03:17 -0400 (Wed, 01 Jul 2009)
New Revision: 16310
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.hblibs/.settings/
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.hblibs/.settings/org.eclipse.jdt.core.prefs
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/.settings/
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/.settings/org.eclipse.jdt.core.prefs
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/.settings/
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/.settings/org.eclipse.jdt.core.prefs
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/.settings/
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/.settings/org.eclipse.jdt.core.prefs
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/Messages.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/messages.properties
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/.settings/
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/.settings/org.eclipse.jdt.core.prefs
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/Messages.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/messages.properties
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/.settings/org.eclipse.jdt.core.prefs
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/Hibernate.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsComposite.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMessages.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/ParametersComposite.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/HibernateUIXMLPlugin.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/Hibernate3CompoundEditor.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3CacheFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/HibernateXMLPlugin.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/FileHibernateFilteredTreeConstraint.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibConfigLoader.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateConstants.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateLoader.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateRecognizer.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddHibernateAnyHandler.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddHibernateCollectionHandler.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddHibernateManyToAnyHandler.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddSubclassHandler.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeleteUniqueHandler.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/FolderOwnerAdopt.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/OpenSourceHandler.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/PasteUniqueHandler.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/ColumnsStructureHelper.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/HibernateTypeHelper.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/IdStructureHelper.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/ContextPackageProvider.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/DatabaseObjectImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigCacheImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigListenerImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigMappingImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateClassImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateElementImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateFormulaImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateIdImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMapImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMetaImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateVersionImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/OrderedObject2Impl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/RegularObject2Impl.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English strings
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.hblibs/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.hblibs/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.hblibs/.settings/org.eclipse.jdt.core.prefs 2009-07-01 08:03:17 UTC (rev 16310)
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/.settings/org.eclipse.jdt.core.prefs 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/.settings/org.eclipse.jdt.core.prefs 2009-07-01 08:03:17 UTC (rev 16310)
@@ -4,4 +4,5 @@
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
org.eclipse.jdt.core.compiler.source=1.5
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/Hibernate.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/Hibernate.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/Hibernate.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -32,12 +32,12 @@
String GENERATOR_PARAMETER__NAME = "name"; //$NON-NLS-1$
String GENERATOR_PARAMETER__VALUE = "value"; //$NON-NLS-1$
- String NAMED_QUERY = PACKAGE_ + "NamedQuery";
- String NAMED_QUERY__NAME = "name";
- String NAMED_QUERY__QUERY = "query";
- String NAMED_QUERY__HINTS = "hints";
+ String NAMED_QUERY = PACKAGE_ + "NamedQuery"; //$NON-NLS-1$
+ String NAMED_QUERY__NAME = "name"; //$NON-NLS-1$
+ String NAMED_QUERY__QUERY = "query"; //$NON-NLS-1$
+ String NAMED_QUERY__HINTS = "hints"; //$NON-NLS-1$
- String NAMED_QUERIES = PACKAGE_ + "NamedQueries";
- String NAMED_QUERIES__VALUE = "value";
+ String NAMED_QUERIES = PACKAGE_ + "NamedQueries"; //$NON-NLS-1$
+ String NAMED_QUERIES__VALUE = "value"; //$NON-NLS-1$
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -49,18 +49,18 @@
//see org.hibernate.id.IdentifierGeneratorFactory.GENERATORS
static {
- generatorClasses.add( "uuid");
- generatorClasses.add( "hilo");
- generatorClasses.add( "assigned");
- generatorClasses.add( "identity");
- generatorClasses.add( "select");
- generatorClasses.add( "sequence");
- generatorClasses.add( "seqhilo");
- generatorClasses.add( "increment");
- generatorClasses.add( "foreign");
- generatorClasses.add( "guid");
- generatorClasses.add( "uuid.hex");
- generatorClasses.add( "sequence-identity");
+ generatorClasses.add( "uuid"); //$NON-NLS-1$
+ generatorClasses.add( "hilo"); //$NON-NLS-1$
+ generatorClasses.add( "assigned"); //$NON-NLS-1$
+ generatorClasses.add( "identity"); //$NON-NLS-1$
+ generatorClasses.add( "select"); //$NON-NLS-1$
+ generatorClasses.add( "sequence"); //$NON-NLS-1$
+ generatorClasses.add( "seqhilo"); //$NON-NLS-1$
+ generatorClasses.add( "increment"); //$NON-NLS-1$
+ generatorClasses.add( "foreign"); //$NON-NLS-1$
+ generatorClasses.add( "guid"); //$NON-NLS-1$
+ generatorClasses.add( "uuid.hex"); //$NON-NLS-1$
+ generatorClasses.add( "sequence-identity"); //$NON-NLS-1$
}
/**
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/.settings/org.eclipse.jdt.core.prefs 2009-07-01 08:03:17 UTC (rev 16310)
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsComposite.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsComposite.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsComposite.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -50,14 +50,14 @@
// Sequence Generator sub-section
container = addCollapsableSubSection(
addSubPane(container, 10),
- "Generic Generator",
+ HibernateUIMappingMessages.HibernateGeneratorsComposite_SectionLabel,
genericGeneratorExpansionStateHolder
);
// Sequence Generator check box
Button genericGeneratorCheckBox = addCheckBox(
addSubPane(container, 5),
- "Generic generator",
+ HibernateUIMappingMessages.HibernateGeneratorsComposite_CheckBoxLabel,
buildGenericGeneratorBooleanHolder(),
null//TODO add help
);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMessages.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMessages.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMessages.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -22,6 +22,10 @@
public static String GenericGeneratorComposite_name;
public static String GenericGeneratorComposite_strategy;
+ public static String HibernateGeneratorsComposite_CheckBoxLabel;
+
+ public static String HibernateGeneratorsComposite_SectionLabel;
+
private HibernateUIMappingMessages() {}
static {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/ParametersComposite.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/ParametersComposite.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/ParametersComposite.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -225,7 +225,7 @@
public String getColumnText(Object element, int columnIndex) {
Parameter parameter = (Parameter) element;
- String value = "";
+ String value = ""; //$NON-NLS-1$
switch (columnIndex) {
case ParameterColumnAdapter.NAME_COLUMN_INDEX: {
@@ -240,7 +240,7 @@
}
if (value == null) {
- value = "";
+ value = ""; //$NON-NLS-1$
}
return value;
@@ -274,7 +274,7 @@
public Object getValue(Object element, String property) {
Parameter parameter = (Parameter) element;
- String value = "";
+ String value = ""; //$NON-NLS-1$
if (property == Parameter.NAME_PROPERTY) {
value = parameter.getName();
@@ -284,7 +284,7 @@
}
if (value == null) {
- value = "";
+ value = ""; //$NON-NLS-1$
}
return value;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties 2009-07-01 08:03:17 UTC (rev 16310)
@@ -1,2 +1,4 @@
GenericGeneratorComposite_strategy=Strategy:
-GenericGeneratorComposite_name=Name:
\ No newline at end of file
+GenericGeneratorComposite_name=Name:
+HibernateGeneratorsComposite_CheckBoxLabel=Generic generator
+HibernateGeneratorsComposite_SectionLabel=Generic Generator
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/.settings/org.eclipse.jdt.core.prefs 2009-07-01 08:03:17 UTC (rev 16310)
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/.settings/org.eclipse.jdt.core.prefs 2009-07-01 08:03:17 UTC (rev 16310)
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/.settings/org.eclipse.jdt.core.prefs 2009-07-01 08:03:17 UTC (rev 16310)
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/HibernateXMLPlugin.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/HibernateXMLPlugin.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/HibernateXMLPlugin.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -15,7 +15,7 @@
import org.eclipse.ui.plugin.AbstractUIPlugin;
public class HibernateXMLPlugin extends AbstractUIPlugin {
- public static final String PLUGIN_ID = "org.jboss.tools.hibernate.xml";
+ public static final String PLUGIN_ID = "org.jboss.tools.hibernate.xml"; //$NON-NLS-1$
static HibernateXMLPlugin INSTANCE = null;
@@ -37,7 +37,7 @@
}
public static void log(Exception ex) {
- INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, "No message", ex));
+ INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, "No message", ex)); //$NON-NLS-1$
}
public static boolean isDebugEnabled() {
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/Messages.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/Messages.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/Messages.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -0,0 +1,23 @@
+package org.jboss.tools.hibernate.xml;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.xml.messages"; //$NON-NLS-1$
+ public static String DatabaseObjectImpl_GenericName;
+ public static String IdStructureHelper_CloseOption;
+ public static String IdStructureHelper_ShouldNotRemoveLastAttribute;
+ public static String IdStructureHelper_WarningTitle;
+ public static String PasteUniqueHandler_Cancel;
+ public static String PasteUniqueHandler_OK;
+ public static String PasteUniqueHandler_PasteTitle;
+ public static String PasteUniqueHandler_ReplaceExistingElement;
+ public static String RegularObject2Impl_NoIdAttribute;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/messages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/messages.properties (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/messages.properties 2009-07-01 08:03:17 UTC (rev 16310)
@@ -0,0 +1,9 @@
+DatabaseObjectImpl_GenericName=database object
+IdStructureHelper_CloseOption=Close
+IdStructureHelper_ShouldNotRemoveLastAttribute=You should not remove last attribute from composite-id.\nPlease replace id first.
+IdStructureHelper_WarningTitle=Warning
+PasteUniqueHandler_Cancel=Cancel
+PasteUniqueHandler_OK=OK
+PasteUniqueHandler_PasteTitle=Paste
+PasteUniqueHandler_ReplaceExistingElement=Replace existing element {0}
+RegularObject2Impl_NoIdAttribute=No id attribute set for entity {0}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/FileHibernateFilteredTreeConstraint.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/FileHibernateFilteredTreeConstraint.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/FileHibernateFilteredTreeConstraint.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -31,16 +31,16 @@
boolean checkEntity(XModelEntity entity) {
String res = checkedEntities.getProperty(entity.getName());
- if(res != null) return "true".equals(res);
+ if(res != null) return "true".equals(res); //$NON-NLS-1$
XChild[] cs = entity.getChildren();
for (int i = 0; i < cs.length; i++) {
String n = cs[i].getName();
- if(n.startsWith("Hibernate") && n.endsWith("Folder")) {
- checkedEntities.setProperty(n, "true");
+ if(n.startsWith("Hibernate") && n.endsWith("Folder")) { //$NON-NLS-1$ //$NON-NLS-2$
+ checkedEntities.setProperty(n, "true"); //$NON-NLS-1$
return true;
}
}
- checkedEntities.setProperty(entity.getName(), "false");
+ checkedEntities.setProperty(entity.getName(), "false"); //$NON-NLS-1$
return false;
}
@@ -52,7 +52,7 @@
public boolean accepts(XModelObject object) {
String entity = object.getModelEntity().getName();
// if("OrmDiagram".equals(entity)) return false;
- if(entity.startsWith("Hibernate") && entity.endsWith("Folder") && object.getChildren().length == 0) return false;
+ if(entity.startsWith("Hibernate") && entity.endsWith("Folder") && object.getChildren().length == 0) return false; //$NON-NLS-1$ //$NON-NLS-2$
return true;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibConfigLoader.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibConfigLoader.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibConfigLoader.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -26,12 +26,12 @@
}
class HibConfigLoaderUtil extends XModelObjectLoaderUtil {
- static String[] factoryFolders = new String[]{"Properties", "Mappings", "Caches", "Events", "Listeners"};
+ static String[] factoryFolders = new String[]{"Properties", "Mappings", "Caches", "Events", "Listeners"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
public boolean save(Element parent, XModelObject o) {
- if(o.getModelEntity().getName().equals("HibConfig3Security")) {
- if(o.getAttributeValue("context").length() == 0 && o.getChildren().length == 0 &&
- o.getAttributeValue("comment").length() == 0) {
+ if(o.getModelEntity().getName().equals("HibConfig3Security")) { //$NON-NLS-1$
+ if(o.getAttributeValue("context").length() == 0 && o.getChildren().length == 0 && //$NON-NLS-1$
+ o.getAttributeValue("comment").length() == 0) { //$NON-NLS-1$
return true;
}
}
@@ -40,7 +40,7 @@
private String[] getFolders(XModelObject o) {
String entity = o.getModelEntity().getName();
- if(entity.equals("HibConfig3SessionFactory")) return factoryFolders;
+ if(entity.equals("HibConfig3SessionFactory")) return factoryFolders; //$NON-NLS-1$
return null;
}
@@ -77,7 +77,7 @@
if(v == null) return false;
if(v.length() == 0 || v.equals(dv)) {
XAttribute attr = entity.getAttribute(n);
- return (attr != null && "always".equals(attr.getProperty("save")));
+ return (attr != null && "always".equals(attr.getProperty("save"))); //$NON-NLS-1$ //$NON-NLS-2$
}
return super.isSaveable(entity, n, v, dv);
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateConstants.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateConstants.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateConstants.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -12,20 +12,20 @@
public interface HibernateConstants {
- public static String DOC_PUBLICID_3_0 = "-//Hibernate/Hibernate Mapping DTD 3.0//EN";
- public static String DOC_SYSTEMID_3_0 = "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";
+ public static String DOC_PUBLICID_3_0 = "-//Hibernate/Hibernate Mapping DTD 3.0//EN"; //$NON-NLS-1$
+ public static String DOC_SYSTEMID_3_0 = "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"; //$NON-NLS-1$
- public static String CFG_DOC_PUBLICID_3_0 = "-//Hibernate/Hibernate Configuration DTD 3.0//EN";
- public static String CFG_DOC_SYSTEMID_3_0 = "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd";
+ public static String CFG_DOC_PUBLICID_3_0 = "-//Hibernate/Hibernate Configuration DTD 3.0//EN"; //$NON-NLS-1$
+ public static String CFG_DOC_SYSTEMID_3_0 = "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"; //$NON-NLS-1$
- public static String RVE_DOC_PUBLICID_3_0 = "-//Hibernate/Hibernate Reverse Engineering DTD 3.0//EN";
- public static String RVE_DOC_SYSTEMID_3_0 = "http://hibernate.sourceforge.net/hibernate-reverse-engineering-3.0.dtd";
+ public static String RVE_DOC_PUBLICID_3_0 = "-//Hibernate/Hibernate Reverse Engineering DTD 3.0//EN"; //$NON-NLS-1$
+ public static String RVE_DOC_SYSTEMID_3_0 = "http://hibernate.sourceforge.net/hibernate-reverse-engineering-3.0.dtd"; //$NON-NLS-1$
- public static String ENTITY_FILE_HIBERNATE_3_0 = "FileHibernate3";
- public static String ENTITY_HIBERNATE_CACHE_3_0 = "Hibernate3Cache";
- public static String ENTITY_HIBERNATE_PROPERTY_3_0 = "Hibernate3Property";
+ public static String ENTITY_FILE_HIBERNATE_3_0 = "FileHibernate3"; //$NON-NLS-1$
+ public static String ENTITY_HIBERNATE_CACHE_3_0 = "Hibernate3Cache"; //$NON-NLS-1$
+ public static String ENTITY_HIBERNATE_PROPERTY_3_0 = "Hibernate3Property"; //$NON-NLS-1$
- public static String ENTITY_FILE_HIB_CONFIG_3_0 = "FileHibConfig3";
- public static String ENTITY_FILE_HIB_REV_ENG_3_0 = "FileHibReverse3";
+ public static String ENTITY_FILE_HIB_CONFIG_3_0 = "FileHibConfig3"; //$NON-NLS-1$
+ public static String ENTITY_FILE_HIB_REV_ENG_3_0 = "FileHibReverse3"; //$NON-NLS-1$
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateLoader.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateLoader.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateLoader.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -40,28 +40,28 @@
}
class HibernateLoaderUtil extends XModelObjectLoaderUtil {
- static String[] metaFolders = new String[]{"Meta"};
- static String[] fileFolders = new String[]{"Types", "Imports", "Classes", "Result Sets", "Queries", "Filters", "Database Objects"};
- static String[] classFolders = new String[]{"Tuplizers", "Properties", "Subclasses", "SQL", "Filters", "Result Sets", "Queries"};
- static String[] subclassFolders = new String[]{"Tuplizers", "Synchronize", "Properties", "Subclasses", "SQL", "Result Sets", "Queries"};
- static String[] compositeElementFolders = new String[]{"Properties"};
- static String[] listFolders = new String[]{"SQL"};
- static String[] setFolders = new String[]{"SQL", "Filters"};
+ static String[] metaFolders = new String[]{"Meta"}; //$NON-NLS-1$
+ static String[] fileFolders = new String[]{"Types", "Imports", "Classes", "Result Sets", "Queries", "Filters", "Database Objects"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
+ static String[] classFolders = new String[]{"Tuplizers", "Properties", "Subclasses", "SQL", "Filters", "Result Sets", "Queries"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
+ static String[] subclassFolders = new String[]{"Tuplizers", "Synchronize", "Properties", "Subclasses", "SQL", "Result Sets", "Queries"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
+ static String[] compositeElementFolders = new String[]{"Properties"}; //$NON-NLS-1$
+ static String[] listFolders = new String[]{"SQL"}; //$NON-NLS-1$
+ static String[] setFolders = new String[]{"SQL", "Filters"}; //$NON-NLS-1$ //$NON-NLS-2$
static Map<String,String[]> folders = new HashMap<String,String[]>();
static {
- folders.put("file", fileFolders);
- folders.put("class", classFolders);
- folders.put("subclass", subclassFolders);
- folders.put("component", compositeElementFolders);
- folders.put("element", compositeElementFolders);
- folders.put("list", listFolders);
- folders.put("set", setFolders);
+ folders.put("file", fileFolders); //$NON-NLS-1$
+ folders.put("class", classFolders); //$NON-NLS-1$
+ folders.put("subclass", subclassFolders); //$NON-NLS-1$
+ folders.put("component", compositeElementFolders); //$NON-NLS-1$
+ folders.put("element", compositeElementFolders); //$NON-NLS-1$
+ folders.put("list", listFolders); //$NON-NLS-1$
+ folders.put("set", setFolders); //$NON-NLS-1$
}
private String[] getFolders(XModelObject o) {
- String loaderKind = o.getModelEntity().getProperty("loaderKind");
+ String loaderKind = o.getModelEntity().getProperty("loaderKind"); //$NON-NLS-1$
return (loaderKind == null) ? null : (String[])folders.get(loaderKind);
}
@@ -82,8 +82,8 @@
public boolean saveChildren(Element element, XModelObject o) {
saveFolders(element, o, metaFolders);
String entity = o.getModelEntity().getName();
- if("Hibernate3Component".equals(entity)) {
- moveElementToEnd(element, "parent");
+ if("Hibernate3Component".equals(entity)) { //$NON-NLS-1$
+ moveElementToEnd(element, "parent"); //$NON-NLS-1$
}
boolean b = super.saveChildren(element, o);
String[] fs = getFolders(o);
@@ -104,7 +104,7 @@
if(v == null) return false;
if(v.length() == 0 || v.equals(dv)) {
XAttribute attr = entity.getAttribute(n);
- return (attr != null && "always".equals(attr.getProperty("save")));
+ return (attr != null && "always".equals(attr.getProperty("save"))); //$NON-NLS-1$ //$NON-NLS-2$
}
return super.isSaveable(entity, n, v, dv);
}
@@ -118,9 +118,9 @@
}
protected String getChildEntity(XModelEntity entity, Element e) {
- if(e != null && "database-object".equals(e.getNodeName())) {
- Element c = XMLUtilities.getUniqueChild(e, "definition");
- return c != null ? "Hibernate3DatabaseObjectDef" : "Hibernate3DatabaseObjectCreateDrop";
+ if(e != null && "database-object".equals(e.getNodeName())) { //$NON-NLS-1$
+ Element c = XMLUtilities.getUniqueChild(e, "definition"); //$NON-NLS-1$
+ return c != null ? "Hibernate3DatabaseObjectDef" : "Hibernate3DatabaseObjectCreateDrop"; //$NON-NLS-1$ //$NON-NLS-2$
}
return super.getChildEntity(entity, e);
}
@@ -133,7 +133,7 @@
ok = true;
try {
XModelEntity e = XModelMetaDataImpl.getInstance().getEntity(HibernateConstants.ENTITY_HIBERNATE_PROPERTY_3_0);
- XAttribute a = e.getAttribute("type");
+ XAttribute a = e.getAttribute("type"); //$NON-NLS-1$
if(a.getConstraint() instanceof XAttributeConstraintAList) {
XAttributeConstraintAList c = (XAttributeConstraintAList)a.getConstraint();
c.setValues(HibernateTypeHelper.TYPE_NAMES);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateRecognizer.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateRecognizer.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateRecognizer.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -17,29 +17,29 @@
static {
try {
XMLEntityResolver.registerPublicEntity(
- HibernateConstants.DOC_PUBLICID_3_0, HibernateRecognizer.class, "/meta/hibernate-mapping-3.0.dtd"
+ HibernateConstants.DOC_PUBLICID_3_0, HibernateRecognizer.class, "/meta/hibernate-mapping-3.0.dtd" //$NON-NLS-1$
);
XMLEntityResolver.registerSystemEntity(
- HibernateConstants.DOC_SYSTEMID_3_0, HibernateRecognizer.class, "/meta/hibernate-mapping-3.0.dtd"
+ HibernateConstants.DOC_SYSTEMID_3_0, HibernateRecognizer.class, "/meta/hibernate-mapping-3.0.dtd" //$NON-NLS-1$
);
XMLEntityResolver.registerPublicEntity(
- HibernateConstants.CFG_DOC_PUBLICID_3_0, HibernateRecognizer.class, "/meta/hibernate-configuration-3.0.dtd"
+ HibernateConstants.CFG_DOC_PUBLICID_3_0, HibernateRecognizer.class, "/meta/hibernate-configuration-3.0.dtd" //$NON-NLS-1$
);
XMLEntityResolver.registerSystemEntity(
- HibernateConstants.CFG_DOC_SYSTEMID_3_0, HibernateRecognizer.class, "/meta/hibernate-configuration-3.0.dtd"
+ HibernateConstants.CFG_DOC_SYSTEMID_3_0, HibernateRecognizer.class, "/meta/hibernate-configuration-3.0.dtd" //$NON-NLS-1$
);
} catch (Exception e) {}
}
public String getEntityName(String ext, String body) {
- return (body == null || !"xml".equals(ext)) ? null
- : (body.indexOf("\"" + HibernateConstants.DOC_PUBLICID_3_0 + "\"") >= 0
- || body.indexOf("\"" + HibernateConstants.DOC_SYSTEMID_3_0 + "\"") >= 0) ? HibernateConstants.ENTITY_FILE_HIBERNATE_3_0
- : (body.indexOf("\"" + HibernateConstants.CFG_DOC_PUBLICID_3_0 + "\"") >= 0
- || body.indexOf("\"" + HibernateConstants.CFG_DOC_SYSTEMID_3_0 + "\"") >= 0) ? HibernateConstants.ENTITY_FILE_HIB_CONFIG_3_0
- : (body.indexOf("\"" + HibernateConstants.RVE_DOC_PUBLICID_3_0 + "\"") >= 0
- || body.indexOf("\"" + HibernateConstants.RVE_DOC_SYSTEMID_3_0 + "\"") >= 0) ? HibernateConstants.ENTITY_FILE_HIB_REV_ENG_3_0
+ return (body == null || !"xml".equals(ext)) ? null //$NON-NLS-1$
+ : (body.indexOf("\"" + HibernateConstants.DOC_PUBLICID_3_0 + "\"") >= 0 //$NON-NLS-1$ //$NON-NLS-2$
+ || body.indexOf("\"" + HibernateConstants.DOC_SYSTEMID_3_0 + "\"") >= 0) ? HibernateConstants.ENTITY_FILE_HIBERNATE_3_0 //$NON-NLS-1$ //$NON-NLS-2$
+ : (body.indexOf("\"" + HibernateConstants.CFG_DOC_PUBLICID_3_0 + "\"") >= 0 //$NON-NLS-1$ //$NON-NLS-2$
+ || body.indexOf("\"" + HibernateConstants.CFG_DOC_SYSTEMID_3_0 + "\"") >= 0) ? HibernateConstants.ENTITY_FILE_HIB_CONFIG_3_0 //$NON-NLS-1$ //$NON-NLS-2$
+ : (body.indexOf("\"" + HibernateConstants.RVE_DOC_PUBLICID_3_0 + "\"") >= 0 //$NON-NLS-1$ //$NON-NLS-2$
+ || body.indexOf("\"" + HibernateConstants.RVE_DOC_SYSTEMID_3_0 + "\"") >= 0) ? HibernateConstants.ENTITY_FILE_HIB_REV_ENG_3_0 //$NON-NLS-1$ //$NON-NLS-2$
: null;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddHibernateAnyHandler.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddHibernateAnyHandler.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddHibernateAnyHandler.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -21,7 +21,7 @@
protected XModelObject modifyCreatedObject(XModelObject o) {
Properties p = extractProperties(data[0]);
- String[] cs = new String[]{p.getProperty("column1"), p.getProperty("column2")};
+ String[] cs = new String[]{p.getProperty("column1"), p.getProperty("column2")}; //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < cs.length; i++) {
o.addChild(ColumnsStructureHelper.newColumn(o.getModel(), cs[i]));
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddHibernateCollectionHandler.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddHibernateCollectionHandler.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddHibernateCollectionHandler.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -17,14 +17,14 @@
public class AddHibernateCollectionHandler extends DefaultCreateHandler {
protected XModelObject modifyCreatedObject(XModelObject o) {
- XModelObject c = o.getChildByPath("index");
+ XModelObject c = o.getChildByPath("index"); //$NON-NLS-1$
if(c == null) {
- c = o.getModel().createModelObject("Hibernate3Index", null);
+ c = o.getModel().createModelObject("Hibernate3Index", null); //$NON-NLS-1$
o.addChild(c);
}
- c = o.getChildByPath("element");
+ c = o.getChildByPath("element"); //$NON-NLS-1$
if(c == null) {
- c = o.getModel().createModelObject("Hibernate3Element", null);
+ c = o.getModel().createModelObject("Hibernate3Element", null); //$NON-NLS-1$
o.addChild(c);
}
return o;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddHibernateManyToAnyHandler.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddHibernateManyToAnyHandler.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddHibernateManyToAnyHandler.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -21,7 +21,7 @@
protected XModelObject modifyCreatedObject(XModelObject o) {
Properties p = extractProperties(data[0]);
- String[] cs = new String[]{p.getProperty("column1"), p.getProperty("column2")};
+ String[] cs = new String[]{p.getProperty("column1"), p.getProperty("column2")}; //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < cs.length; i++) {
o.addChild(ColumnsStructureHelper.newColumn(o.getModel(), cs[i]));
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddSubclassHandler.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddSubclassHandler.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddSubclassHandler.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -16,10 +16,10 @@
public class AddSubclassHandler extends DefaultCreateHandler {
static String[] entities =
- {"Hibernate3Join",
- "Hibernate3Subclass",
- "Hibernate3JoinedSubclass",
- "Hibernate3UnionSubclass"};
+ {"Hibernate3Join", //$NON-NLS-1$
+ "Hibernate3Subclass", //$NON-NLS-1$
+ "Hibernate3JoinedSubclass", //$NON-NLS-1$
+ "Hibernate3UnionSubclass"}; //$NON-NLS-1$
static int[][] matrix = new int[][]{
{1,1,0,0},
{1,1,0,0},
@@ -36,7 +36,7 @@
public boolean isEnabled(XModelObject object) {
if(!super.isEnabled(object)) return true;
- String entity = action.getProperty("entity");
+ String entity = action.getProperty("entity"); //$NON-NLS-1$
if(entity == null) return true;
XModelObject[] os = object.getChildren();
if(os.length == 0) return true;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeleteUniqueHandler.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeleteUniqueHandler.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeleteUniqueHandler.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -23,14 +23,14 @@
public void executeHandler(XModelObject object, Properties p) throws XModelException {
if(!isEnabled(object)) return;
- String transactionName = "delete " + DefaultCreateHandler.title(object, false);
+ String transactionName = "delete " + DefaultCreateHandler.title(object, false); //$NON-NLS-1$
executeInTransaction(object, p, transactionName, XTransactionUndo.REMOVE);
}
protected void transaction(XModelObject object, Properties p) throws XModelException {
XModelObject parent = object.getParent();
removeFromParent(object);
- String entity = action.getProperty("entity");
+ String entity = action.getProperty("entity"); //$NON-NLS-1$
if(entity == null) entity = object.getModelEntity().getName();
XModelObject c = XModelObjectLoaderUtil.createValidObject(object.getModel(), entity);
DefaultCreateHandler.addCreatedObject(parent, c, p);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/FolderOwnerAdopt.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/FolderOwnerAdopt.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/FolderOwnerAdopt.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -30,7 +30,7 @@
if(isAdoptableGrandChild(target, object)) {
XModelObject folder = getFolderForChild(target, object);
if(folder == null) return;
- XActionInvoker.invoke("CopyActions.Paste", folder, null);
+ XActionInvoker.invoke("CopyActions.Paste", folder, null); //$NON-NLS-1$
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/OpenSourceHandler.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/OpenSourceHandler.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/OpenSourceHandler.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -21,13 +21,13 @@
XModelObject f = object;
while(f != null && f.getFileType() != XModelObject.FILE) f = f.getParent();
if(f == null) return v;
- String p = f.getAttributeValue("package");
- if(p != null && p.length() > 0) return p + "." + v;
+ String p = f.getAttributeValue("package"); //$NON-NLS-1$
+ if(p != null && p.length() > 0) return p + "." + v; //$NON-NLS-1$
return v;
}
protected String getAttribute() {
- return action.getProperty("attribute");
+ return action.getProperty("attribute"); //$NON-NLS-1$
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/PasteUniqueHandler.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/PasteUniqueHandler.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/PasteUniqueHandler.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.hibernate.xml.model.handlers;
+import java.text.MessageFormat;
import java.util.Properties;
import org.jboss.tools.common.meta.XChild;
@@ -19,6 +20,7 @@
import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.ServiceDialog;
+import org.jboss.tools.hibernate.xml.Messages;
public class PasteUniqueHandler extends PasteHandler {
@@ -43,11 +45,10 @@
if(c == null || c.getMaxCount() > 1) return true;
XModelObject co = parent.getChildByPath(source.getPathPart());
if(co == null) return true;
- String message = "Replace existing element ";
- String n = "<" + co.getModelEntity().getXMLSubPath() + ">";
- message += n;
+ String n = "<" + co.getModelEntity().getXMLSubPath() + ">"; //$NON-NLS-1$ //$NON-NLS-2$
+ String message = MessageFormat.format(Messages.PasteUniqueHandler_ReplaceExistingElement, n);
ServiceDialog d = parent.getModel().getService();
- int q = d.showDialog("Paste", message, new String[]{"OK", "Cancel"}, null, ServiceDialog.QUESTION);
+ int q = d.showDialog(Messages.PasteUniqueHandler_PasteTitle, message, new String[]{Messages.PasteUniqueHandler_OK, Messages.PasteUniqueHandler_Cancel}, null, ServiceDialog.QUESTION);
if(q != 0) return false;
DefaultRemoveHandler.removeFromParent(co);
return true;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/ColumnsStructureHelper.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/ColumnsStructureHelper.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/ColumnsStructureHelper.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -22,7 +22,7 @@
import org.jboss.tools.common.model.XModelObject;
public class ColumnsStructureHelper {
- public static String ENT_HIBERNATE_COLUMN = "Hibernate3Column";
+ public static String ENT_HIBERNATE_COLUMN = "Hibernate3Column"; //$NON-NLS-1$
public static boolean isColumnObject(XModelObject object) {
return ENT_HIBERNATE_COLUMN.equals(object.getModelEntity().getName());
@@ -30,7 +30,7 @@
public static XModelObject newColumn(XModel model, String name) {
XModelObject c = model.createModelObject(ENT_HIBERNATE_COLUMN, null);
- c.setAttributeValue("name", name);
+ c.setAttributeValue("name", name); //$NON-NLS-1$
return c;
}
@@ -58,10 +58,10 @@
*/
public static String getDeclaredColumnName(XModelObject columnOwner) {
if(!hasNoChildColumns(columnOwner)) return null;
- String column = columnOwner.getAttributeValue("column");
+ String column = columnOwner.getAttributeValue("column"); //$NON-NLS-1$
if(column == null || column.length() > 0) return column;
- String name = columnOwner.getAttributeValue("name");
- if(name != null && name.length() == 0 && IdStructureHelper.isId(columnOwner)) return "id";
+ String name = columnOwner.getAttributeValue("name"); //$NON-NLS-1$
+ if(name != null && name.length() == 0 && IdStructureHelper.isId(columnOwner)) return "id"; //$NON-NLS-1$
return name;
}
@@ -76,7 +76,7 @@
XAttribute[] as = c.getModelEntity().getAttributes();
for (int i = 0; i < as.length; i++) {
String n = as[i].getName();
- if("name".equals(n)) continue;
+ if("name".equals(n)) continue; //$NON-NLS-1$
String v = columnOwner.getAttributeValue(n);
if(v == null || v.equals(as[i].getDefaultValue())) continue;
c.setAttributeValue(n, v);
@@ -104,7 +104,7 @@
XAttribute[] as = column.getModelEntity().getAttributes();
for (int i = 0; i < as.length; i++) {
String n = as[i].getName();
- if("name".equals(n) || "persistent".equals(n)) continue;
+ if("name".equals(n) || "persistent".equals(n)) continue; //$NON-NLS-1$ //$NON-NLS-2$
String v = column.getAttributeValue(n);
if(v == null || v.equals(as[i].getDefaultValue())) continue;
if(attribute.getAttribute(n) == null) return true;
@@ -136,9 +136,9 @@
for (int i = 0; i < as.length; i++) {
String n = as[i].getName();
String v = column.getAttributeValue(n);
- if("name".equals(n)) {
- n = "column";
- if(v.equals(attribute.getAttributeValue("name"))) v = "";
+ if("name".equals(n)) { //$NON-NLS-1$
+ n = "column"; //$NON-NLS-1$
+ if(v.equals(attribute.getAttributeValue("name"))) v = ""; //$NON-NLS-1$ //$NON-NLS-2$
}
if(v == null) continue;
/// if(!"column".equals(n) && v.equals(as[i].getDefaultValue())) continue;
@@ -154,17 +154,17 @@
Set<String> set = new HashSet<String>();
if(table == null) return set;
XModelObject[] cs = table.getChildren();
- for (int i = 0; i < cs.length; i++) set.add(cs[i].getAttributeValue("name"));
+ for (int i = 0; i < cs.length; i++) set.add(cs[i].getAttributeValue("name")); //$NON-NLS-1$
return set;
}
public static void provideUniqueName(XModelObject column, Set<String> columns) {
- String n = column.getAttributeValue("name");
+ String n = column.getAttributeValue("name"); //$NON-NLS-1$
if(columns.contains(n)) {
int i = 1;
while(columns.contains(n + i)) ++i;
n = n + i;
- column.setAttributeValue("name", n);
+ column.setAttributeValue("name", n); //$NON-NLS-1$
}
columns.add(n);
}
@@ -188,7 +188,7 @@
public static void replaceColumnDeclarationWithChild(XModelObject attrReference, XModelObject column) throws XModelException {
DefaultCreateHandler.addCreatedObject(attrReference, column, -1);
- XModelObject c = newColumn(attrReference.getModel(), attrReference.getAttributeValue("name"));
+ XModelObject c = newColumn(attrReference.getModel(), attrReference.getAttributeValue("name")); //$NON-NLS-1$
mergeColumnDataToAttribute(attrReference, c);
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/HibernateTypeHelper.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/HibernateTypeHelper.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/HibernateTypeHelper.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -18,6 +18,7 @@
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+@SuppressWarnings("nls")
public class HibernateTypeHelper {
static Properties hToJ = new Properties();
static Properties jToH = new Properties();
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/IdStructureHelper.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/IdStructureHelper.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/helpers/IdStructureHelper.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -19,11 +19,12 @@
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.engines.impl.EnginesLoader;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+import org.jboss.tools.hibernate.xml.Messages;
public class IdStructureHelper {
- public static String ENT_HIBERNATE_ID = "Hibernate3Id";
- public static String ENT_HIBERNATE_COMPOSITE_ID = "Hibernate3CompositeId";
- public static String ID_PATH_PART = "[id]";
+ public static String ENT_HIBERNATE_ID = "Hibernate3Id"; //$NON-NLS-1$
+ public static String ENT_HIBERNATE_COMPOSITE_ID = "Hibernate3CompositeId"; //$NON-NLS-1$
+ public static String ID_PATH_PART = "[id]"; //$NON-NLS-1$
public static XModelObject getIdChild(XModelObject clsReference) {
return clsReference.getChildByPath(ID_PATH_PART);
@@ -65,7 +66,7 @@
List<XModelObject> list = new ArrayList<XModelObject>();
XModelObject[] cs = id.getChildren();
for (int i = 0; i < cs.length; i++) {
- if(cs[i].getModelEntity().getName().startsWith("HibernateMeta")) continue;
+ if(cs[i].getModelEntity().getName().startsWith("HibernateMeta")) continue; //$NON-NLS-1$
list.add(cs[i]);
}
return list.toArray(new XModelObject[0]);
@@ -73,26 +74,26 @@
}
public static XModelObject[] getAsAttributes(XModelObject id) throws XModelException {
- String name = id.getAttributeValue("name");
+ String name = id.getAttributeValue("name"); //$NON-NLS-1$
if(name.length() == 0) return new XModelObject[0];
String entity = id.getModelEntity().getName();
if(ENT_HIBERNATE_ID.equals(entity)) {
- XModelObject c = id.getModel().createModelObject("HibernateProperty", null);
+ XModelObject c = id.getModel().createModelObject("HibernateProperty", null); //$NON-NLS-1$
EnginesLoader.merge(c, id, false);
return new XModelObject[]{c};
- } else if("HibernateCompositeId".equals(entity)) {
- String cls = id.getAttributeValue("class");
+ } else if("HibernateCompositeId".equals(entity)) { //$NON-NLS-1$
+ String cls = id.getAttributeValue("class"); //$NON-NLS-1$
if(cls.length() == 0) {
XModelObject[] cs = id.getChildren();
List<XModelObject> list = new ArrayList<XModelObject>();
for (int i = 0; i < cs.length; i++) {
- if(cs[i].getModelEntity().getName().startsWith("HibernateMeta")) continue;
+ if(cs[i].getModelEntity().getName().startsWith("HibernateMeta")) continue; //$NON-NLS-1$
XModelObject gc = getAsAttribute(cs[i]);
if(gc != null) list.add(gc);
}
return list.toArray(new XModelObject[0]);
} else {
- XModelObject c = id.getModel().createModelObject("HibernateComponent", null);
+ XModelObject c = id.getModel().createModelObject("HibernateComponent", null); //$NON-NLS-1$
EnginesLoader.merge(c, id, false);
XModelObject[] cs = id.getChildren();
for (int i = 0; i < cs.length; i++) {
@@ -107,8 +108,8 @@
public static XModelObject getAsAttribute(XModelObject key) throws XModelException {
String ec = key.getModelEntity().getName();
- String er = ("HibernateKeyProperty".equals(ec)) ? "HibernateProperty"
- : ("HibernateKeyManyToOne".equals(ec)) ? "HibernateManyToOne"
+ String er = ("HibernateKeyProperty".equals(ec)) ? "HibernateProperty" //$NON-NLS-1$ //$NON-NLS-2$
+ : ("HibernateKeyManyToOne".equals(ec)) ? "HibernateManyToOne" //$NON-NLS-1$ //$NON-NLS-2$
: null;
if(er == null) return null;
XModelObject a = key.getModel().createModelObject(er, null);
@@ -126,7 +127,7 @@
} else if(ENT_HIBERNATE_COMPOSITE_ID.equals(entity)) {
XModelObject[] cs = id.getChildren();
for (int i = 0; i < cs.length; i++) {
- if(cs[i].getModelEntity().getName().startsWith("HibernateMeta")) continue;
+ if(cs[i].getModelEntity().getName().startsWith("HibernateMeta")) continue; //$NON-NLS-1$
addColumnsToList(cs[i], list);
}
}
@@ -134,35 +135,35 @@
}
private static void addColumnsToList(XModelObject o, List<XModelObject> list) throws XModelException {
- XModelObject[] cs = o.getChildren("HibernateColumn");
+ XModelObject[] cs = o.getChildren("HibernateColumn"); //$NON-NLS-1$
if(cs.length > 0) {
for (int i = 0; i < cs.length; i++) list.add(cs[i].copy());
} else {
- String column = o.getAttributeValue("column");
+ String column = o.getAttributeValue("column"); //$NON-NLS-1$
if(column == null) return;
- XModelObject c = o.getModel().createModelObject("HibernateColumn", null);
+ XModelObject c = o.getModel().createModelObject("HibernateColumn", null); //$NON-NLS-1$
EnginesLoader.merge(c, o, false);
- if(column.length() > 0) c.setAttributeValue("name", column);
+ if(column.length() > 0) c.setAttributeValue("name", column); //$NON-NLS-1$
list.add(c);
}
}
public static boolean isDefaultId(XModelObject id) {
return isNamelessId(id) && !isIdComposite(id) &&
- id.getAttributeValue("column").length() == 0 &&
- id.getChildren("HibernateColumn").length == 0;
+ id.getAttributeValue("column").length() == 0 && //$NON-NLS-1$
+ id.getChildren("HibernateColumn").length == 0; //$NON-NLS-1$
}
public static boolean isNamelessId(XModelObject id) {
- return isId(id) && id.getAttributeValue("name").length() == 0;
+ return isId(id) && id.getAttributeValue("name").length() == 0; //$NON-NLS-1$
}
public static String getIdType(XModelObject id) {
if(id == null) return null;
if(ENT_HIBERNATE_ID.equals(id.getModelEntity().getName())) {
- return id.getAttributeValue("type");
+ return id.getAttributeValue("type"); //$NON-NLS-1$
} else if(isIdComposite(id)) {
- return id.getAttributeValue("class");
+ return id.getAttributeValue("class"); //$NON-NLS-1$
} else {
return null;
}
@@ -183,8 +184,8 @@
public static boolean isCompositeIdOfOtherType(XModelObject object) {
if(object == null || !isIdComposite(object)) return false;
- return (object.getAttributeValue("name").length() > 0 ||
- object.getAttributeValue("class").length() > 0);
+ return (object.getAttributeValue("name").length() > 0 || //$NON-NLS-1$
+ object.getAttributeValue("class").length() > 0); //$NON-NLS-1$
}
public static boolean isLastPropertyInCompositeId(XModelObject object) {
@@ -195,9 +196,9 @@
}
public static void showLastPropertyInCompositeIdWarning(XModel model) {
- String message = "You should not remove last attribute from composite-id.\n" +
- "Please replace id first.";
- model.getService().showDialog("Warning", message, new String[]{"Close"}, null, ServiceDialog.WARNING);
+ String message = Messages.IdStructureHelper_ShouldNotRemoveLastAttribute;
+ model.getService().showDialog(Messages.IdStructureHelper_WarningTitle, message,
+ new String[]{Messages.IdStructureHelper_CloseOption}, null, ServiceDialog.WARNING);
}
// public static JavaBean getBeanForId(XModelObject id) {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/ContextPackageProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/ContextPackageProvider.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/ContextPackageProvider.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -19,7 +19,7 @@
public String getContextPackage() {
while(object != null && object.getFileType() != XModelObject.FILE) object = object.getParent();
if(object == null) return null;
- String s = object.getAttributeValue("package");
+ String s = object.getAttributeValue("package"); //$NON-NLS-1$
if(s != null && s.length() == 0) return null;
return s;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/DatabaseObjectImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/DatabaseObjectImpl.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/DatabaseObjectImpl.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -10,27 +10,29 @@
******************************************************************************/
package org.jboss.tools.hibernate.xml.model.impl;
+import org.jboss.tools.hibernate.xml.Messages;
+
public class DatabaseObjectImpl extends RegularObject2Impl {
private static final long serialVersionUID = 1L;
public DatabaseObjectImpl() {}
public String getPresentationString() {
- if("Hibernate3DatabaseObjectDef".equals(getModelEntity().getName())) {
+ if("Hibernate3DatabaseObjectDef".equals(getModelEntity().getName())) { //$NON-NLS-1$
return super.getPresentationString();
}
- String s = getAttributeValue("drop");
- if(s == null || s.length() == 0) return "database object";
+ String s = getAttributeValue("drop"); //$NON-NLS-1$
+ if(s == null || s.length() == 0) return Messages.DatabaseObjectImpl_GenericName;
s = s.trim();
- if(s.toLowerCase().startsWith("drop")) {
+ if(s.toLowerCase().startsWith("drop")) { //$NON-NLS-1$
s = s.substring(4).trim();
}
- if(s != null && s.length() > 23) s = s.substring(0, 20) + "...";
+ if(s != null && s.length() > 23) s = s.substring(0, 20) + "..."; //$NON-NLS-1$
return s;
}
public String getAttributeValue(String name) {
- if("presentation".equals(name)) {
+ if("presentation".equals(name)) { //$NON-NLS-1$
return getPresentationString();
} else {
return super.getAttributeValue(name);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigCacheImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigCacheImpl.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigCacheImpl.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -14,19 +14,19 @@
private static final long serialVersionUID = 1L;
public String getAttributeValue(String name) {
- if("item".equals(name)) {
- String[] as = {"class", "collection"};
+ if("item".equals(name)) { //$NON-NLS-1$
+ String[] as = {"class", "collection"}; //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < as.length; i++) {
String s = getAttributeValue(as[i]);
- if(s != null && s.length() > 0) return as[i] + "=" + s;
+ if(s != null && s.length() > 0) return as[i] + "=" + s; //$NON-NLS-1$
}
- return "";
+ return ""; //$NON-NLS-1$
}
return super.getAttributeValue(name);
}
public String setAttributeValue(String name, String value) {
- if("item".equals(name)) {
+ if("item".equals(name)) { //$NON-NLS-1$
return getAttributeValue(name);
}
return super.setAttributeValue(name, value);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigListenerImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigListenerImpl.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigListenerImpl.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -8,9 +8,9 @@
public String getPathPart() {
String pp = super.getPathPart();
- String type = getAttributeValue("type");
+ String type = getAttributeValue("type"); //$NON-NLS-1$
if(type != null && type.length() > 0) {
- pp += ":" + type;
+ pp += ":" + type; //$NON-NLS-1$
}
return pp;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigMappingImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigMappingImpl.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigMappingImpl.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -14,19 +14,19 @@
private static final long serialVersionUID = 1L;
public String getAttributeValue(String name) {
- if("item".equals(name)) {
- String[] as = {"resource", "file", "jar", "package", "class"};
+ if("item".equals(name)) { //$NON-NLS-1$
+ String[] as = {"resource", "file", "jar", "package", "class"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
for (int i = 0; i < as.length; i++) {
String s = getAttributeValue(as[i]);
- if(s != null && s.length() > 0) return as[i] + "=" + s;
+ if(s != null && s.length() > 0) return as[i] + "=" + s; //$NON-NLS-1$
}
- return "";
+ return ""; //$NON-NLS-1$
}
return super.getAttributeValue(name);
}
public String setAttributeValue(String name, String value) {
- if("item".equals(name)) {
+ if("item".equals(name)) { //$NON-NLS-1$
return getAttributeValue(name);
}
return super.setAttributeValue(name, value);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateClassImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateClassImpl.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateClassImpl.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -14,12 +14,12 @@
private static final long serialVersionUID = 3382417320218706443L;
public String get(String s) {
- if("details".equals(s)) {
- String elementType = getAttributeValue("element type");
- if("join".equals(elementType)) {
- return "join " + "table=" + getAttributeValue("table");
+ if("details".equals(s)) { //$NON-NLS-1$
+ String elementType = getAttributeValue("element type"); //$NON-NLS-1$
+ if("join".equals(elementType)) { //$NON-NLS-1$
+ return "join " + "table=" + getAttributeValue("table"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} else {
- return elementType + " name=" + getAttributeValue("name");
+ return elementType + " name=" + getAttributeValue("name"); //$NON-NLS-1$ //$NON-NLS-2$
}
}
return super.get(s);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateElementImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateElementImpl.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateElementImpl.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -16,17 +16,17 @@
private static final long serialVersionUID = 220538596631608391L;
public String getPresentationString() {
- String presentationAttr = getModelEntity().getProperty("presentationAttribute");
- return ((presentationAttr != null) ? getAttributeValue(presentationAttr) : "") +
- "[" + getAttributeValue("element type") + "]";
+ String presentationAttr = getModelEntity().getProperty("presentationAttribute"); //$NON-NLS-1$
+ return ((presentationAttr != null) ? getAttributeValue(presentationAttr) : "") + //$NON-NLS-1$
+ "[" + getAttributeValue("element type") + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
public String name() {
- return "" + getPathPart();
+ return "" + getPathPart(); //$NON-NLS-1$
}
public String getPathPart() {
- return "element";
+ return "element"; //$NON-NLS-1$
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateFormulaImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateFormulaImpl.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateFormulaImpl.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -16,10 +16,10 @@
private static final long serialVersionUID = 1L;
public String name() {
- return "formula";
+ return "formula"; //$NON-NLS-1$
}
public String getPathPart() {
- return "" + ("" + getAttributeValue("value")).hashCode();
+ return "" + ("" + getAttributeValue("value")).hashCode(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateIdImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateIdImpl.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateIdImpl.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -22,21 +22,21 @@
}
public String name() {
- String nm = "" + getAttributeValue("name");
- if(nm.length() == 0) nm = "<" + getModelEntity().getXMLSubPath() + ">";
+ String nm = "" + getAttributeValue("name"); //$NON-NLS-1$ //$NON-NLS-2$
+ if(nm.length() == 0) nm = "<" + getModelEntity().getXMLSubPath() + ">"; //$NON-NLS-1$ //$NON-NLS-2$
return nm;
}
public String getPathPart() {
- return "[id]";
+ return "[id]"; //$NON-NLS-1$
}
}
class IdOrderedByEntityChildren extends OrderedByEntityChildren {
protected int getEntityIndex(String s) {
- if("Hibernate3KeyManyToOne".equals(s))
- s = "Hibernate3KeyProperty";
+ if("Hibernate3KeyManyToOne".equals(s)) //$NON-NLS-1$
+ s = "Hibernate3KeyProperty"; //$NON-NLS-1$
return super.getEntityIndex(s);
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMapImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMapImpl.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMapImpl.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -20,20 +20,20 @@
private static final long serialVersionUID = 1L;
public String getAttributeValue(String name) {
- if("index".equals(name)) {
- XModelObject c = getChildByPath("index");
- return c == null ? "index" : c.getAttributeValue("element type");
- } else if("element".equals(name)) {
- XModelObject c = getChildByPath("element");
- return c == null ? "element" : c.getAttributeValue("element type");
+ if("index".equals(name)) { //$NON-NLS-1$
+ XModelObject c = getChildByPath("index"); //$NON-NLS-1$
+ return c == null ? "index" : c.getAttributeValue("element type"); //$NON-NLS-1$ //$NON-NLS-2$
+ } else if("element".equals(name)) { //$NON-NLS-1$
+ XModelObject c = getChildByPath("element"); //$NON-NLS-1$
+ return c == null ? "element" : c.getAttributeValue("element type"); //$NON-NLS-1$ //$NON-NLS-2$
}
return super.getAttributeValue(name);
}
public String setAttributeValue(String name, String value) {
- if("index".equals(name)) {
+ if("index".equals(name)) { //$NON-NLS-1$
return value;
- } else if("element".equals(name)) {
+ } else if("element".equals(name)) { //$NON-NLS-1$
return value;
}
return super.setAttributeValue(name, value);
@@ -41,30 +41,30 @@
protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
if(newValue == null || newValue.equals(oldValue)) return;
- if("index".equals(name)) {
+ if("index".equals(name)) { //$NON-NLS-1$
String actionName =
- "index".equals(newValue) ? "AddIndex" :
- "list-index".equals(newValue) ? "AddListIndex" :
- "map-key".equals(newValue) ? "AddMapKey" :
- "composite-map-key".equals(newValue) ? "AddCompositeMapKey" :
- "map-key-many-to-many".equals(newValue) ? "AddMapKeyManyToMany" :
- "composite-index".equals(newValue) ? "AddCompositeIndex" :
- "index-many-to-any".equals(newValue) ? "AddIndexManyToAny" :
- "index-many-to-many".equals(newValue) ? "AddIndexManyToMany" :
+ "index".equals(newValue) ? "AddIndex" : //$NON-NLS-1$ //$NON-NLS-2$
+ "list-index".equals(newValue) ? "AddListIndex" : //$NON-NLS-1$ //$NON-NLS-2$
+ "map-key".equals(newValue) ? "AddMapKey" : //$NON-NLS-1$ //$NON-NLS-2$
+ "composite-map-key".equals(newValue) ? "AddCompositeMapKey" : //$NON-NLS-1$ //$NON-NLS-2$
+ "map-key-many-to-many".equals(newValue) ? "AddMapKeyManyToMany" : //$NON-NLS-1$ //$NON-NLS-2$
+ "composite-index".equals(newValue) ? "AddCompositeIndex" : //$NON-NLS-1$ //$NON-NLS-2$
+ "index-many-to-any".equals(newValue) ? "AddIndexManyToAny" : //$NON-NLS-1$ //$NON-NLS-2$
+ "index-many-to-many".equals(newValue) ? "AddIndexManyToMany" : //$NON-NLS-1$ //$NON-NLS-2$
null;
- String actionPath = (actionName == null) ? null : "CreateActions.IndexActions." + actionName;
+ String actionPath = (actionName == null) ? null : "CreateActions.IndexActions." + actionName; //$NON-NLS-1$
if(actionPath != null && XActionInvoker.getAction(actionPath, this) != null) {
XActionInvoker.invoke(actionPath, this, new Properties());
}
- } else if("element".equals(name)) {
+ } else if("element".equals(name)) { //$NON-NLS-1$
String actionName =
- "element".equals(newValue) ? "AddElement" :
- "one-to-many".equals(newValue) ? "AddOneToMany" :
- "many-to-many".equals(newValue) ? "AddManyToMany" :
- "composite-element".equals(newValue) ? "AddCompositeElement" :
- "many-to-any".equals(newValue) ? "AddManyToAny" :
+ "element".equals(newValue) ? "AddElement" : //$NON-NLS-1$ //$NON-NLS-2$
+ "one-to-many".equals(newValue) ? "AddOneToMany" : //$NON-NLS-1$ //$NON-NLS-2$
+ "many-to-many".equals(newValue) ? "AddManyToMany" : //$NON-NLS-1$ //$NON-NLS-2$
+ "composite-element".equals(newValue) ? "AddCompositeElement" : //$NON-NLS-1$ //$NON-NLS-2$
+ "many-to-any".equals(newValue) ? "AddManyToAny" : //$NON-NLS-1$ //$NON-NLS-2$
null;
- String actionPath = (actionName == null) ? null : "CreateActions." + actionName;
+ String actionPath = (actionName == null) ? null : "CreateActions." + actionName; //$NON-NLS-1$
if(actionPath != null && XActionInvoker.getAction(actionPath, this) != null) {
XActionInvoker.invoke(actionPath, this, new Properties());
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMetaImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMetaImpl.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateMetaImpl.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -16,13 +16,13 @@
private static final long serialVersionUID = 6834715619315516824L;
public String name() {
- return "" + getAttributeValue("attribute");
+ return "" + getAttributeValue("attribute"); //$NON-NLS-1$ //$NON-NLS-2$
}
public String getPathPart() {
- String v = getAttributeValue("value");
+ String v = getAttributeValue("value"); //$NON-NLS-1$
int hash = (v == null) ? -1 : v.hashCode();
- return name() + "[" + hash + "]";
+ return name() + "[" + hash + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateVersionImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateVersionImpl.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibernateVersionImpl.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -16,11 +16,11 @@
private static final long serialVersionUID = 220540876994971851L;
public String getPathPart() {
- return "version";
+ return "version"; //$NON-NLS-1$
}
public String getPresentationString() {
- return "" + getAttributeValue("name");
+ return "" + getAttributeValue("name"); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/OrderedObject2Impl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/OrderedObject2Impl.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/OrderedObject2Impl.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -19,7 +19,7 @@
protected RegularChildren createChildren() {
return new OrderedByEntityChildren() {
protected int getEntityIndex(String s) {
- if("Hibernate3Formula".equals(s)) return super.getEntityIndex("Hibernate3Column");
+ if("Hibernate3Formula".equals(s)) return super.getEntityIndex("Hibernate3Column"); //$NON-NLS-1$ //$NON-NLS-2$
return super.getEntityIndex(s);
}
};
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/RegularObject2Impl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/RegularObject2Impl.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/RegularObject2Impl.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -10,9 +10,11 @@
******************************************************************************/
package org.jboss.tools.hibernate.xml.model.impl;
+import java.text.MessageFormat;
import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.model.impl.OrderedObjectImpl;
import org.jboss.tools.hibernate.xml.HibernateXMLPlugin;
+import org.jboss.tools.hibernate.xml.Messages;
public class RegularObject2Impl extends OrderedObjectImpl {
private static final long serialVersionUID = 1L;
@@ -22,18 +24,18 @@
if(attribute != null) return attribute;
XAttribute[] as = getModelEntity().getAttributes();
for (int i = 0; i < as.length; i++) {
- if("true".equals(as[i].getProperty("id"))) {
+ if("true".equals(as[i].getProperty("id"))) { //$NON-NLS-1$ //$NON-NLS-2$
attribute = as[i].getName();
return attribute;
}
}
- HibernateXMLPlugin.log("No id attribute set for entity " + getModelEntity().getName());
+ HibernateXMLPlugin.log(MessageFormat.format(Messages.RegularObject2Impl_NoIdAttribute, getModelEntity().getName()));
attribute = as[0].getName();
return attribute;
}
public String name() {
- return "" + getAttributeValue(getAttribute());
+ return "" + getAttributeValue(getAttribute()); //$NON-NLS-1$
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/HibernateUIXMLPlugin.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/HibernateUIXMLPlugin.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/HibernateUIXMLPlugin.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -15,7 +15,7 @@
import org.eclipse.ui.plugin.AbstractUIPlugin;
public class HibernateUIXMLPlugin extends AbstractUIPlugin {
- public static final String PLUGIN_ID = "org.jboss.tools.hibernate.xml.ui";
+ public static final String PLUGIN_ID = "org.jboss.tools.hibernate.xml.ui"; //$NON-NLS-1$
static HibernateUIXMLPlugin INSTANCE = null;
@@ -37,7 +37,7 @@
}
public static void log(Exception ex) {
- INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, "No message", ex));
+ INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, Messages.HibernateUIXMLPlugin_NoExceptionMessage, ex));
}
public static boolean isDebugEnabled() {
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/Messages.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/Messages.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/Messages.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -0,0 +1,20 @@
+package org.jboss.tools.hibernate.ui.xml;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.xml.messages"; //$NON-NLS-1$
+ public static String HibConfig3CompoundEditor_SecurityLabel;
+ public static String HibConfig3CompoundEditor_SecurityTitle;
+ public static String HibConfig3CompoundEditor_SessionFactoryLabel;
+ public static String HibConfig3CompoundEditor_SessionFactoryTitle;
+ public static String Hibernate3CompoundEditor_HibernateXMLEditor;
+ public static String HibernateUIXMLPlugin_NoExceptionMessage;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -15,6 +15,7 @@
import org.jboss.tools.common.model.ui.editors.multipage.DefaultMultipageEditor;
import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorComponent;
import org.jboss.tools.hibernate.ui.xml.HibernateUIXMLPlugin;
+import org.jboss.tools.hibernate.ui.xml.Messages;
import org.jboss.tools.hibernate.xml.model.FileHibernateFilteredTreeConstraint;
@@ -27,25 +28,25 @@
if(isAppropriateNature()) {
sessionFactory = createTreeFormPage();
- sessionFactory.setLabel("Session Factory");
- sessionFactory.setTitle("Hibernate Configuration 3.0 XML Editor");
+ sessionFactory.setLabel(Messages.HibConfig3CompoundEditor_SessionFactoryLabel);
+ sessionFactory.setTitle(Messages.HibConfig3CompoundEditor_SessionFactoryTitle);
((TreeFormPage)sessionFactory).addFilter(new FileHibernateFilteredTreeConstraint());
- sessionFactory.initialize(object.getChildByPath("Session Factory"));
- addFormPage(sessionFactory, "sessionFactoryEditor");
+ sessionFactory.initialize(object.getChildByPath("Session Factory")); //$NON-NLS-1$
+ addFormPage(sessionFactory, "sessionFactoryEditor"); //$NON-NLS-1$
security = createTreeFormPage();
- security.setLabel("Security");
- security.setTitle("Hibernate Configuration 3.0 XML Editor");
+ security.setLabel(Messages.HibConfig3CompoundEditor_SecurityLabel);
+ security.setTitle(Messages.HibConfig3CompoundEditor_SecurityTitle);
((TreeFormPage)security).addFilter(new FileHibernateFilteredTreeConstraint());
- security.initialize(object.getChildByPath("Security"));
- addFormPage(security, "securityEditor");
+ security.initialize(object.getChildByPath("Security")); //$NON-NLS-1$
+ addFormPage(security, "securityEditor"); //$NON-NLS-1$
}
createTextPage();
initEditors();
- if(treeFormPage != null) selectionProvider.addHost("treeEditor", treeFormPage.getSelectionProvider());
- if(sessionFactory != null) selectionProvider.addHost("sessionFactoryEditor", sessionFactory.getSelectionProvider());
- if(textEditor != null) selectionProvider.addHost("textEditor", getTextSelectionProvider());
+ if(treeFormPage != null) selectionProvider.addHost("treeEditor", treeFormPage.getSelectionProvider()); //$NON-NLS-1$
+ if(sessionFactory != null) selectionProvider.addHost("sessionFactoryEditor", sessionFactory.getSelectionProvider()); //$NON-NLS-1$
+ if(textEditor != null) selectionProvider.addHost("textEditor", getTextSelectionProvider()); //$NON-NLS-1$
}
protected void addFormPage(TreeFormPage formPage, String name) {
@@ -63,9 +64,9 @@
protected void setNormalMode() {
if (treeFormPage!=null) { // AU added
- sessionFactory.initialize(getModelObject().getChildByPath("Session Factory")); // AU added
+ sessionFactory.initialize(getModelObject().getChildByPath("Session Factory")); // AU added //$NON-NLS-1$
sessionFactory.setErrorMode(isErrorMode());
- security.initialize(getModelObject().getChildByPath("Security")); // AU added
+ security.initialize(getModelObject().getChildByPath("Security")); // AU added //$NON-NLS-1$
security.setErrorMode(isErrorMode());
} // AU added
if (selectionProvider!=null) {
@@ -78,9 +79,9 @@
protected void setErrorMode() {
if (treeFormPage!=null) { // AU added
- sessionFactory.initialize(getModelObject().getChildByPath("Session Factory")); // AU added
+ sessionFactory.initialize(getModelObject().getChildByPath("Session Factory")); // AU added //$NON-NLS-1$
sessionFactory.setErrorMode(isErrorMode());
- security.initialize(getModelObject().getChildByPath("Security")); // AU added
+ security.initialize(getModelObject().getChildByPath("Security")); // AU added //$NON-NLS-1$
security.setErrorMode(isErrorMode());
} // AU added
if (treeEditor!=null) {
@@ -90,7 +91,7 @@
public Object getAdapter(Class adapter) {
if (adapter == EditorDescriptor.class)
- return new EditorDescriptor("HibernateConfiguration3.0");
+ return new EditorDescriptor("HibernateConfiguration3.0"); //$NON-NLS-1$
return super.getAdapter(adapter);
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/Hibernate3CompoundEditor.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/Hibernate3CompoundEditor.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/Hibernate3CompoundEditor.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -18,6 +18,7 @@
import org.jboss.tools.common.model.ui.editor.EditorDescriptor;
import org.jboss.tools.common.model.ui.editors.multipage.DefaultMultipageEditor;
import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorComponent;
+import org.jboss.tools.hibernate.ui.xml.Messages;
import org.jboss.tools.hibernate.xml.model.FileHibernateFilteredTreeConstraint;
@@ -26,20 +27,20 @@
protected void doCreatePages() {
if(isAppropriateNature()) {
treeFormPage = createTreeFormPage();
- treeFormPage.setTitle("Hibernate 3.0 XML Editor");
+ treeFormPage.setTitle(Messages.Hibernate3CompoundEditor_HibernateXMLEditor);
((TreeFormPage)treeFormPage).addFilter(new FileHibernateFilteredTreeConstraint());
treeFormPage.initialize(object);
addFormPage(treeFormPage);
}
createTextPage();
initEditors();
- if(treeFormPage != null) selectionProvider.addHost("treeEditor", treeFormPage.getSelectionProvider());
- if(textEditor != null) selectionProvider.addHost("textEditor", getTextSelectionProvider());
+ if(treeFormPage != null) selectionProvider.addHost("treeEditor", treeFormPage.getSelectionProvider()); //$NON-NLS-1$
+ if(textEditor != null) selectionProvider.addHost("textEditor", getTextSelectionProvider()); //$NON-NLS-1$
}
public Object getAdapter(Class adapter) {
if (adapter == EditorDescriptor.class)
- return new EditorDescriptor("Hibernate3.0");
+ return new EditorDescriptor("Hibernate3.0"); //$NON-NLS-1$
return super.getAdapter(adapter);
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3CacheFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3CacheFormLayoutData.java 2009-07-01 07:07:14 UTC (rev 16309)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3CacheFormLayoutData.java 2009-07-01 08:03:17 UTC (rev 16310)
@@ -18,25 +18,25 @@
* @author glory
*/
public class HibConfig3CacheFormLayoutData {
- static String CLASS_CACHE_ENTITY = "HibConfig3ClassCache";
- static String COLLECTION_CACHE_ENTITY = "HibConfig3CollectionCache";
+ static String CLASS_CACHE_ENTITY = "HibConfig3ClassCache"; //$NON-NLS-1$
+ static String COLLECTION_CACHE_ENTITY = "HibConfig3CollectionCache"; //$NON-NLS-1$
final static IFormData CACHE_LIST_DEFINITION = new FormData(
"Caches",
- "", //Description
+ "", //Description //$NON-NLS-1$
"Caches",
new FormAttributeData[]{new FormAttributeData("item", 100, "item")},
new String[]{CLASS_CACHE_ENTITY, COLLECTION_CACHE_ENTITY},
- Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddCache")
+ Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddCache") //$NON-NLS-1$
);
final static IFormData CACHE_FOLDER_DEFINITION = new FormData(
"Caches",
- "", //"Description
+ "", //"Description //$NON-NLS-1$
"HibConfig3CachesFolder",
new FormAttributeData[]{new FormAttributeData("item", 100, "item")},
new String[]{CLASS_CACHE_ENTITY, COLLECTION_CACHE_ENTITY},
- Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddCache")
+ Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddCache") //$NON-NLS-1$
);
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/messages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/messages.properties (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/messages.properties 2009-07-01 08:03:17 UTC (rev 16310)
@@ -0,0 +1,6 @@
+HibConfig3CompoundEditor_SecurityLabel=Security
+HibConfig3CompoundEditor_SecurityTitle=Hibernate Configuration 3.0 XML Editor
+HibConfig3CompoundEditor_SessionFactoryLabel=Session Factory
+HibConfig3CompoundEditor_SessionFactoryTitle=Hibernate Configuration 3.0 XML Editor
+Hibernate3CompoundEditor_HibernateXMLEditor=Hibernate 3.0 XML Editor
+HibernateUIXMLPlugin_NoExceptionMessage=No message
15 years, 8 months
JBoss Tools SVN: r16309 - in trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core: command and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: sflanigan
Date: 2009-07-01 03:07:14 -0400 (Wed, 01 Jul 2009)
New Revision: 16309
Modified:
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeListConverter.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeManager.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/UninstallJBossWSClassPathCommand.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/IJBossWSFacetDataModelProperties.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JBossWSFacetInstallDataModelProvider.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCore.properties
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCoreMessages.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JBossWSCoreUtils.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/StatusUtils.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English strings
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java 2009-07-01 06:38:06 UTC (rev 16308)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java 2009-07-01 07:07:14 UTC (rev 16309)
@@ -34,7 +34,7 @@
*/
public class JBossWSRuntimeClassPathInitializer extends
AbstractClasspathContainerInitializer {
- public final static String JBOSS_WS_RUNTIME_CLASSPATH_CONTAINER_ID = "org.jboss.ws.runtime.classpath";
+ public final static String JBOSS_WS_RUNTIME_CLASSPATH_CONTAINER_ID = "org.jboss.ws.runtime.classpath"; //$NON-NLS-1$
public JBossWSRuntimeClassPathInitializer() {
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeListConverter.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeListConverter.java 2009-07-01 06:38:06 UTC (rev 16308)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeListConverter.java 2009-07-01 07:07:14 UTC (rev 16309)
@@ -18,17 +18,17 @@
/*
* Constants definitions
*/
- private static final String REGEXP_ESCAPE = "\\";
- private static final String COMMA = ",";
- private static final String LIBRARY_SEPARATOR = ";";
- private static final String EMPTY_STRING = "";
- private static final String FIELD_SEPARATOR = "|";
- private static final String DEFAULT = "default";
- private static final String HOME_DIR = "homeDir";
- private static final String VERSION = "version";
- private static final String NAME = "name";
- private static final String USER_CONFIG_CLASSPATH = "userConfig";
- private static final String LIBRARY = "libraries";
+ private static final String REGEXP_ESCAPE = "\\"; //$NON-NLS-1$
+ private static final String COMMA = ","; //$NON-NLS-1$
+ private static final String LIBRARY_SEPARATOR = ";"; //$NON-NLS-1$
+ private static final String EMPTY_STRING = ""; //$NON-NLS-1$
+ private static final String FIELD_SEPARATOR = "|"; //$NON-NLS-1$
+ private static final String DEFAULT = "default"; //$NON-NLS-1$
+ private static final String HOME_DIR = "homeDir"; //$NON-NLS-1$
+ private static final String VERSION = "version"; //$NON-NLS-1$
+ private static final String NAME = "name"; //$NON-NLS-1$
+ private static final String USER_CONFIG_CLASSPATH = "userConfig"; //$NON-NLS-1$
+ private static final String LIBRARY = "libraries"; //$NON-NLS-1$
/**
* Load String to JBossWSRuntime map from String
@@ -92,9 +92,9 @@
}
private String convertListToString(List<String> libraries){
- String strLib = "";
+ String strLib = ""; //$NON-NLS-1$
for(String library: libraries){
- if("".equals(strLib)){
+ if("".equals(strLib)){ //$NON-NLS-1$
strLib = library;
}else{
strLib = strLib + LIBRARY_SEPARATOR + library;
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeManager.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeManager.java 2009-07-01 06:38:06 UTC (rev 16308)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeManager.java 2009-07-01 07:07:14 UTC (rev 16309)
@@ -164,7 +164,7 @@
List<File> jars = new ArrayList<File>();
if(folder.isDirectory()){
for(File file: folder.listFiles()){
- if(file.isFile() && (file.getName().endsWith(".jar") || file.getName().endsWith(".zip"))){
+ if(file.isFile() && (file.getName().endsWith(".jar") || file.getName().endsWith(".zip"))){ //$NON-NLS-1$ //$NON-NLS-2$
jars.add(file);
}else if (folder.isDirectory()){
jars.addAll(getJarsOfFolder(file));
@@ -296,7 +296,7 @@
private void onRuntimeNameChanged(String oldName, String newName) {
IProjectFacet facet = ProjectFacetsManager
- .getProjectFacet("jbossws.core");
+ .getProjectFacet("jbossws.core"); //$NON-NLS-1$
Set<IFacetedProject> facetedProjects = null;
try {
facetedProjects = ProjectFacetsManager.getFacetedProjects(facet);
@@ -324,7 +324,7 @@
public static boolean isRuntimeUsed(String name) {
IProjectFacet facet = ProjectFacetsManager
- .getProjectFacet("jbossws.core");
+ .getProjectFacet("jbossws.core"); //$NON-NLS-1$
Set<IFacetedProject> facetedProjects = null;
try {
facetedProjects = ProjectFacetsManager.getFacetedProjects(facet);
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/UninstallJBossWSClassPathCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/UninstallJBossWSClassPathCommand.java 2009-07-01 06:38:06 UTC (rev 16308)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/UninstallJBossWSClassPathCommand.java 2009-07-01 07:07:14 UTC (rev 16309)
@@ -69,7 +69,7 @@
public IStatus removeClassPath(IProject project, String segment) {
IStatus status = Status.OK_STATUS;
- if(segment == null || "".equals(segment)){
+ if(segment == null || "".equals(segment)){ //$NON-NLS-1$
return status;
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/IJBossWSFacetDataModelProperties.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/IJBossWSFacetDataModelProperties.java 2009-07-01 06:38:06 UTC (rev 16308)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/IJBossWSFacetDataModelProperties.java 2009-07-01 07:07:14 UTC (rev 16309)
@@ -19,15 +19,15 @@
// Seam Preferences names constants
- String JBOSS_WS_FACET_ID = "jbossws.core";
- String JBOSS_WS_DEPLOY = "jboss.ws.deploy";
- String QUALIFIEDNAME_IDENTIFIER = "jboss.tools.jbossws";
- String JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED = "jboss.ws.is.server.supplied";
- String JBOSS_WS_RUNTIME_ID = "jboss.ws.runtime_id";
+ String JBOSS_WS_FACET_ID = "jbossws.core"; //$NON-NLS-1$
+ String JBOSS_WS_DEPLOY = "jboss.ws.deploy"; //$NON-NLS-1$
+ String QUALIFIEDNAME_IDENTIFIER = "jboss.tools.jbossws"; //$NON-NLS-1$
+ String JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED = "jboss.ws.is.server.supplied"; //$NON-NLS-1$
+ String JBOSS_WS_RUNTIME_ID = "jboss.ws.runtime_id"; //$NON-NLS-1$
- String PERSISTENT_PROPERTY_IS_SERVER_SUPPLIED_RUNTIME = "is.server.supplied.runtime";
- String JBOSS_WS_RUNTIME_HOME = "jboss.ws.runtime.home";
- String DEFAULT_VALUE_IS_SERVER_SUPPLIED = "true";
+ String PERSISTENT_PROPERTY_IS_SERVER_SUPPLIED_RUNTIME = "is.server.supplied.runtime"; //$NON-NLS-1$
+ String JBOSS_WS_RUNTIME_HOME = "jboss.ws.runtime.home"; //$NON-NLS-1$
+ String DEFAULT_VALUE_IS_SERVER_SUPPLIED = "true"; //$NON-NLS-1$
static QualifiedName PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME = new QualifiedName(QUALIFIEDNAME_IDENTIFIER,
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JBossWSFacetInstallDataModelProvider.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JBossWSFacetInstallDataModelProvider.java 2009-07-01 06:38:06 UTC (rev 16308)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JBossWSFacetInstallDataModelProvider.java 2009-07-01 07:07:14 UTC (rev 16309)
@@ -50,7 +50,7 @@
if(propertyName.equals(JBOSS_WS_DEPLOY)){
return false;
}else if(propertyName.equals(JBOSS_WS_RUNTIME_ID)){
- return "";
+ return ""; //$NON-NLS-1$
}else if(propertyName.equals(FACET_ID)){
return IJBossWSFacetDataModelProperties.JBOSS_WS_FACET_ID;
}
@@ -67,8 +67,8 @@
boolean serverSupplied = getBooleanProperty(JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED);
String runtimeName = getStringProperty(JBOSS_WS_RUNTIME_ID);
if (!serverSupplied
- && (runtimeName == null || runtimeName.equals(""))) {
- return StatusUtils.errorStatus("");
+ && (runtimeName == null || runtimeName.equals(""))) { //$NON-NLS-1$
+ return StatusUtils.errorStatus(""); //$NON-NLS-1$
}
return super.validate(name);
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCore.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCore.properties 2009-07-01 06:38:06 UTC (rev 16308)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCore.properties 2009-07-01 07:07:14 UTC (rev 16309)
@@ -6,5 +6,7 @@
WS_Location=jbosswsruntimelocation
JBossWS_Runtime_Lib=JBossWS_Runtime
JBossWS_Runtime=JBoss WS Runtime
+JBossWSCoreUtils_ErrorResourceNotFile=The following path is not a file: {0}.
+JBossWSCoreUtils_ErrorResourceNotFolder=Resource {0} is not a folder.
Error_Add_Facet_JBossWS=Exception while install JBossWS facet
Error_Remove_Facet_JBossWS=Exception while uninstall JBossWS facet
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCoreMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCoreMessages.java 2009-07-01 06:38:06 UTC (rev 16308)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCoreMessages.java 2009-07-01 07:07:14 UTC (rev 16309)
@@ -16,7 +16,7 @@
/**
* @author Grid Qian
*/
-public class JBossWSCoreMessages {
+public class JBossWSCoreMessages extends NLS {
private static final String BUNDLE_NAME = "org.jboss.tools.ws.core.messages.JBossWSCore"; //$NON-NLS-1$
@@ -32,6 +32,8 @@
public static String WS_Location;
public static String JBossWS_Runtime_Lib;
public static String JBossWS_Runtime;
+ public static String JBossWSCoreUtils_ErrorResourceNotFile;
+ public static String JBossWSCoreUtils_ErrorResourceNotFolder;
public static String Error_Add_Facet_JBossWS;
public static String Error_Remove_Facet_JBossWS;
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JBossWSCoreUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JBossWSCoreUtils.java 2009-07-01 06:38:06 UTC (rev 16308)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JBossWSCoreUtils.java 2009-07-01 07:07:14 UTC (rev 16309)
@@ -62,7 +62,7 @@
// Fix for the windows build not working
private static String replaceEscapecharactors(String vulnarableString) {
- if (vulnarableString.indexOf("/") != -1) {
+ if (vulnarableString.indexOf("/") != -1) { //$NON-NLS-1$
vulnarableString = vulnarableString.replace('/', File.separator
.charAt(0));
}
@@ -82,7 +82,7 @@
// Windows check (because from inside wtp in return I received a hard
// coded path)
if (File.separatorChar == '\\') {
- return "\\";
+ return "\\"; //$NON-NLS-1$
} else {
return File.separator;
}
@@ -92,7 +92,7 @@
// Windows check (because from inside wtp in return I received a hard
// coded path)
if (File.separatorChar == '\\') {
- return "\\" + File.separator;
+ return "\\" + File.separator; //$NON-NLS-1$
} else {
return File.separator;
}
@@ -170,7 +170,7 @@
return (IFolder) child;
} else {
throw new CoreException(new Status(IStatus.ERROR,
- "ResourceUtils", 0, NLS.bind("ERROR",// EnvironmentMessages.MSG_ERROR_RESOURCE_NOT_FOLDER,
+ "ResourceUtils", 0, NLS.bind(JBossWSCoreMessages.JBossWSCoreUtils_ErrorResourceNotFolder, //$NON-NLS-1$ // EnvironmentMessages.MSG_ERROR_RESOURCE_NOT_FOLDER
new Object[] { parent.getFullPath().append(
folderName).toString() }), null));
}
@@ -200,7 +200,7 @@
} else {
throw new CoreException(new Status(IStatus.ERROR,
- "ResourceUtils", 0, NLS.bind("ERROR",
+ "ResourceUtils", 0, NLS.bind(JBossWSCoreMessages.JBossWSCoreUtils_ErrorResourceNotFile, //$NON-NLS-1$ // EnvironmentMessages.MSG_ERROR_RESOURCE_NOT_FILE
new Object[] { parent.getFullPath().append(
fileName) }), null));
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/StatusUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/StatusUtils.java 2009-07-01 06:38:06 UTC (rev 16308)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/StatusUtils.java 2009-07-01 07:07:14 UTC (rev 16309)
@@ -19,43 +19,43 @@
{
public static IStatus errorStatus( String errorMessage )
{
- return new Status( IStatus.ERROR, "id", 0, errorMessage, null );
+ return new Status( IStatus.ERROR, "id", 0, errorMessage, null ); //$NON-NLS-1$
}
public static IStatus errorStatus( Throwable exc )
{
String message = exc.getMessage();
- return new Status( IStatus.ERROR, "id", 0, message == null ? "" : message, exc );
+ return new Status( IStatus.ERROR, "id", 0, message == null ? "" : message, exc ); //$NON-NLS-1$ //$NON-NLS-2$
}
public static IStatus errorStatus( String message, Throwable exc )
{
- return new Status( IStatus.ERROR, "id", 0, message, exc );
+ return new Status( IStatus.ERROR, "id", 0, message, exc ); //$NON-NLS-1$
}
public static MultiStatus multiStatus( String message, IStatus[] children, Throwable exc )
{
- return new MultiStatus( "id", 0, children, message, exc );
+ return new MultiStatus( "id", 0, children, message, exc ); //$NON-NLS-1$
}
public static MultiStatus multiStatus( String message, IStatus[] children )
{
- return new MultiStatus( "id", 0, children, message, null );
+ return new MultiStatus( "id", 0, children, message, null ); //$NON-NLS-1$
}
public static IStatus warningStatus( String warningMessage )
{
- return new Status( IStatus.WARNING, "id", 0, warningMessage, null );
+ return new Status( IStatus.WARNING, "id", 0, warningMessage, null ); //$NON-NLS-1$
}
public static IStatus warningStatus( String warningMessage, Throwable exc )
{
- return new Status( IStatus.WARNING, "id", 0, warningMessage, exc );
+ return new Status( IStatus.WARNING, "id", 0, warningMessage, exc ); //$NON-NLS-1$
}
public static IStatus infoStatus( String infoMessage )
{
- return new Status( IStatus.INFO, "id", 0, infoMessage, null );
+ return new Status( IStatus.INFO, "id", 0, infoMessage, null ); //$NON-NLS-1$
}
}
\ No newline at end of file
15 years, 8 months