JBoss Tools SVN: r11587 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-11-06 11:50:29 -0500 (Thu, 06 Nov 2008)
New Revision: 11587
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java
Log:
Loop prevented
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java 2008-11-06 16:33:31 UTC (rev 11586)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java 2008-11-06 16:50:29 UTC (rev 11587)
@@ -273,7 +273,10 @@
ELArgumentImpl arg = new ELArgumentImpl();
arg.setFirstToken(current);
arg.setLastToken(current);
- if(!hasNextToken()) return arg;
+ if(!hasNextToken()) {
+ setNextToken();
+ return arg;
+ }
setNextToken();
ELExpressionImpl expr = readExpression();
if(expr != null) {
17 years, 5 months
JBoss Tools SVN: r11584 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-11-06 10:13:38 -0500 (Thu, 06 Nov 2008)
New Revision: 11584
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XMetaDataLoader.java
Log:
JBIDE-2969
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XMetaDataLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XMetaDataLoader.java 2008-11-06 15:06:28 UTC (rev 11583)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XMetaDataLoader.java 2008-11-06 15:13:38 UTC (rev 11584)
@@ -120,7 +120,7 @@
String module = "";
Element v = XMLUtilities.getUniqueChild(g, "VERSION");
if(v != null && v.hasAttribute("MODULE")) {
- module = v.getAttribute("module");
+ module = v.getAttribute("MODULE");
}
loadMappings(factory, g);
factory.createIconList(getUniqueChild(g, ICONS));
17 years, 5 months
JBoss Tools SVN: r11583 - trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-06 10:06:28 -0500 (Thu, 06 Nov 2008)
New Revision: 11583
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java
Log:
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-11-06 14:24:07 UTC (rev 11582)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-11-06 15:06:28 UTC (rev 11583)
@@ -30,7 +30,6 @@
*/
public class SmooksModelUtils {
-
public static final String BEAN_CLASS = "beanClass";
public static final String BEAN_ID = "beanId";
17 years, 5 months
JBoss Tools SVN: r11582 - trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-06 09:24:07 -0500 (Thu, 06 Nov 2008)
New Revision: 11582
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java
Log:
JBIDE-3129
Externalize String
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-11-06 14:09:01 UTC (rev 11581)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-11-06 14:24:07 UTC (rev 11582)
@@ -30,7 +30,13 @@
*/
public class SmooksModelUtils {
-
+
+ public static final String BEAN_CLASS = "beanClass";
+
+ public static final String BEAN_ID = "beanId";
+
+ public static final String BINDINGS = "bindings";
+
public static EStructuralFeature ATTRIBUTE_PROPERTY = ExtendedMetaData.INSTANCE
.demandFeature(null, "property", false);
17 years, 5 months
JBoss Tools SVN: r11581 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: javabean/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-06 09:09:01 -0500 (Thu, 06 Nov 2008)
New Revision: 11581
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/messages.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/messages.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/messages.properties
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ConnectionPropertySection.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksResourceChangeListener.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksTextEdtor.java
Log:
JBIDE-3129
Externalize String
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2008-11-06 13:44:53 UTC (rev 11580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2008-11-06 14:09:01 UTC (rev 11581)
@@ -38,7 +38,7 @@
private Object error = null;
- private String name = "";
+ private String name = ""; //$NON-NLS-1$
private Class typeRef = null;
@@ -92,11 +92,11 @@
}
Class clazz = this.getBeanClass();
if (clazz == null)
- return "<null>";
+ return "<null>"; //$NON-NLS-1$
if (clazz.isArray()) {
String s = clazz.getComponentType().getName();
- return s + "[]";
+ return s + "[]"; //$NON-NLS-1$
}
return clazz.getName();
@@ -301,7 +301,7 @@
for (int i = 0; i < pds.length; i++) {
PropertyDescriptor pd = pds[i];
- if ("class".equals(pd.getName()))
+ if ("class".equals(pd.getName())) //$NON-NLS-1$
continue;
JavaBeanModel jbm = new JavaBeanModel(pd.getPropertyType(), pd
.getName(), pd, beanClass, this.lazyLoadProperties);
@@ -356,16 +356,16 @@
* @see java.lang.Object#toString()
*/
public String toString() {
- StringBuffer buffer = new StringBuffer("JavaBean Name : " + name);
+ StringBuffer buffer = new StringBuffer(Messages.getString("JavaBeanModel.JavaBeanName") + name); //$NON-NLS-1$
if (beanClass != null)
- buffer.append(";Class : " + this.beanClass.getName());
+ buffer.append(Messages.getString("JavaBeanModel.ClassIs") + this.beanClass.getName()); //$NON-NLS-1$
if (this.properties != null) {
- buffer.append("\n");
+ buffer.append("\n"); //$NON-NLS-1$
for (Iterator iterator = properties.iterator(); iterator.hasNext();) {
JavaBeanModel child = (JavaBeanModel) iterator.next();
- buffer.append("\t");
+ buffer.append("\t"); //$NON-NLS-1$
buffer.append(child.toString());
- buffer.append("\n");
+ buffer.append("\n"); //$NON-NLS-1$
}
}
return buffer.toString();
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/Messages.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/Messages.java 2008-11-06 14:09:01 UTC (rev 11581)
@@ -0,0 +1,22 @@
+package org.jboss.tools.smooks.javabean.model;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages {
+ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.javabean.model.messages"; //$NON-NLS-1$
+
+ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+ .getBundle(BUNDLE_NAME);
+
+ private Messages() {
+ }
+
+ public static String getString(String key) {
+ try {
+ return RESOURCE_BUNDLE.getString(key);
+ } catch (MissingResourceException e) {
+ return '!' + key + '!';
+ }
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/Messages.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/messages.properties (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/messages.properties 2008-11-06 14:09:01 UTC (rev 11581)
@@ -0,0 +1,2 @@
+JavaBeanModel.ClassIs=;Class :
+JavaBeanModel.JavaBeanName=JavaBean Name :
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java 2008-11-06 13:44:53 UTC (rev 11580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java 2008-11-06 14:09:01 UTC (rev 11581)
@@ -46,11 +46,11 @@
}
public JavaBeanConfigWizardPage(IJavaProject selection) {
- super("beansearchwizardpage");
+ super("beansearchwizardpage"); //$NON-NLS-1$
this.project = selection;
setPageComplete(true);
- setTitle("JavaBean Class selection page");
- setDescription("Select the JavaBean class");
+ setTitle(Messages.getString("JavaBeanConfigWizardPage.JavaBeanSelectionDialogTitle")); //$NON-NLS-1$
+ setDescription(Messages.getString("JavaBeanConfigWizardPage.JavaBeanSelectionDialogDesc")); //$NON-NLS-1$
}
protected void initilize() {
@@ -111,7 +111,7 @@
protected void updatePage() {
String error = null;
if (project == null) {
- error = "Please select a Java project.";
+ error = Messages.getString("JavaBeanConfigWizardPage.JavaBeanSelectionDialogErrorMsg"); //$NON-NLS-1$
}
setPageComplete(error == null);
this.setErrorMessage(error);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java 2008-11-06 13:44:53 UTC (rev 11580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java 2008-11-06 14:09:01 UTC (rev 11581)
@@ -74,7 +74,7 @@
// this.runnableContext = new
// ProgressMonitorDialog(parent.getShell());
if (this.runnableContext == null)
- throw new Exception("Can't init IRunnableContent");
+ throw new Exception(Messages.getString("JavaBeanModelLoadComposite.InitRunnableContextException")); //$NON-NLS-1$
}
if (project != null) {
@@ -100,7 +100,7 @@
com.setLayout(layout);
Label classLabel = new Label(com, SWT.NULL);
- classLabel.setText("Class Name:");
+ classLabel.setText(Messages.getString("JavaBeanModelLoadComposite.ClassNameText")); //$NON-NLS-1$
Composite classTextContainer = new Composite(com, SWT.NONE);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -124,7 +124,7 @@
classBrowseButton = new Button(classTextContainer, SWT.NONE);
classBrowseButton.addSelectionListener(this);
- classBrowseButton.setText("Browse...");
+ classBrowseButton.setText(Messages.getString("JavaBeanModelLoadComposite.Browse")); //$NON-NLS-1$
}
return com;
}
@@ -194,8 +194,8 @@
try {
dialog = JavaUI.createTypeDialog(this.getShell(), runnableContext,
scope, IJavaElementSearchConstants.CONSIDER_CLASSES, false);
- dialog.setMessage("Source Java Bean:");
- dialog.setTitle("Search java bean");
+ dialog.setMessage(Messages.getString("JavaBeanModelLoadComposite.SourceJavaBean")); //$NON-NLS-1$
+ dialog.setTitle(Messages.getString("JavaBeanModelLoadComposite.SearchJavaType")); //$NON-NLS-1$
if (dialog.open() == Window.OK) {
Object[] results = dialog.getResult();
@@ -207,7 +207,7 @@
|| packageFullName.length() <= 0) {
classText.setText(((IType) result).getElementName());
} else {
- classText.setText(packageFullName + "."
+ classText.setText(packageFullName + "." //$NON-NLS-1$
+ ((IType) result).getElementName());
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java 2008-11-06 13:44:53 UTC (rev 11580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java 2008-11-06 14:09:01 UTC (rev 11581)
@@ -59,7 +59,7 @@
*/
public class JavaBeanPropertiesSection extends AbstractSmooksPropertySection {
- private static final String PRO_TYPE = "type";
+ private static final String PRO_TYPE = "type"; //$NON-NLS-1$
private Text instanceClassText;
@@ -88,7 +88,7 @@
main.setLayout(fill);
Section section = factory.createSection(main, Section.TITLE_BAR);
- section.setText("JavaBean Properties");
+ section.setText(Messages.getString("JavaBeanPropertiesSection.JavaBeanProperties")); //$NON-NLS-1$
Composite controlComposite = factory.createComposite(section);
section.setClient(controlComposite);
GridLayout gl = new GridLayout();
@@ -96,7 +96,7 @@
controlComposite.setLayout(gl);
- factory.createLabel(controlComposite, "Target instance class name : ");
+ factory.createLabel(controlComposite, Messages.getString("JavaBeanPropertiesSection.TargetInstanceClass")); //$NON-NLS-1$
instanceClassComposite = factory.createComposite(controlComposite);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -105,12 +105,12 @@
beanLayout.numColumns = 2;
instanceClassComposite.setLayout(beanLayout);
- instanceClassText = factory.createText(instanceClassComposite, "");
+ instanceClassText = factory.createText(instanceClassComposite, ""); //$NON-NLS-1$
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.grabExcessHorizontalSpace = true;
instanceClassText.setLayoutData(gd);
- Button button1 = factory.createButton(instanceClassComposite, "Browse",
+ Button button1 = factory.createButton(instanceClassComposite, Messages.getString("JavaBeanPropertiesSection.Browse"), //$NON-NLS-1$
SWT.NONE);
button1.addSelectionListener(new SelectionAdapter() {
@@ -121,7 +121,7 @@
});
- factory.createLabel(controlComposite, "Mapping Type : ");
+ factory.createLabel(controlComposite, Messages.getString("JavaBeanPropertiesSection.MappingType")); //$NON-NLS-1$
typeComposite = factory.createComposite(controlComposite);
gd = new GridData(GridData.FILL_HORIZONTAL);
typeComposite.setLayoutData(gd);
@@ -129,7 +129,7 @@
typeLayout.numColumns = 2;
typeComposite.setLayout(typeLayout);
- classTypeText = factory.createText(typeComposite, "");
+ classTypeText = factory.createText(typeComposite, ""); //$NON-NLS-1$
classTypeText.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -152,7 +152,7 @@
GridLayout buttonLayout = new GridLayout();
buttonLayout.numColumns = 2;
buttonCom.setLayout(buttonLayout);
- Button button3 = factory.createButton(buttonCom, "Browse class",
+ Button button3 = factory.createButton(buttonCom, Messages.getString("JavaBeanPropertiesSection.ClassBrowse"), //$NON-NLS-1$
SWT.NONE);
button3.addSelectionListener(new SelectionAdapter() {
@@ -163,7 +163,7 @@
});
- Button button2 = factory.createButton(buttonCom, "Browse custom type",
+ Button button2 = factory.createButton(buttonCom, Messages.getString("JavaBeanPropertiesSection.CustomTypeBrowse"), //$NON-NLS-1$
SWT.NONE);
button2.addSelectionListener(new SelectionAdapter() {
@@ -205,7 +205,7 @@
IJavaProject javaProject = createNewProjectClassLoader();
if (javaProject == null) {
MessageDialog.openError(this.getPart().getSite().getShell(),
- "Error", "can't open type selection dialog");
+ Messages.getString("JavaBeanPropertiesSection.ErrorMessageTitle"), Messages.getString("JavaBeanPropertiesSection.TypeDialogErrorMessage")); //$NON-NLS-1$ //$NON-NLS-2$
return;
}
IJavaSearchScope scope = JavaSearchScopeFactory.getInstance()
@@ -216,8 +216,8 @@
SmooksUIActivator.getDefault().getWorkbench()
.getActiveWorkbenchWindow(), scope,
IJavaElementSearchConstants.CONSIDER_CLASSES, false);
- dialog.setMessage("Java Type:");
- dialog.setTitle("Search Java Type");
+ dialog.setMessage(Messages.getString("JavaBeanPropertiesSection.JavaType")); //$NON-NLS-1$
+ dialog.setTitle(Messages.getString("JavaBeanPropertiesSection.SearchJavaType")); //$NON-NLS-1$
if (dialog.open() == Window.OK) {
Object[] results = dialog.getResult();
@@ -229,7 +229,7 @@
|| packageFullName.length() <= 0) {
text.setText(((IType) result).getElementName());
} else {
- text.setText(packageFullName + "."
+ text.setText(packageFullName + "." //$NON-NLS-1$
+ ((IType) result).getElementName());
}
}
@@ -345,7 +345,7 @@
JavaBeanModel model = getTargetJavaBeanModel();
String type = getTypeProperty(getLineConnectionModel());
if (type == null)
- type = "";
+ type = ""; //$NON-NLS-1$
LineConnectionModel connection = getLineConnectionModel();
if(connection == null){
instanceClassComposite.setEnabled(false);
@@ -359,7 +359,7 @@
// classTypeText.setEnabled(false);
String className = model.getBeanClassString();
lockEventFire();
- this.classTypeText.setText("");
+ this.classTypeText.setText(""); //$NON-NLS-1$
typeComposite.setEnabled(false);
instanceClassText.setText(className);
unLockEventFire();
@@ -368,7 +368,7 @@
if (type != null) {
typeComposite.setEnabled(true);
lockEventFire();
- instanceClassText.setText("");
+ instanceClassText.setText(""); //$NON-NLS-1$
instanceClassComposite.setEnabled(false);
this.classTypeText.setText(type);
unLockEventFire();
@@ -383,7 +383,7 @@
if(properties == null) return null;
for (int i = 0; i < properties.length; i++) {
PropertyModel pro = (PropertyModel) properties[i];
- if ("type".equalsIgnoreCase(pro.getName())) {
+ if (Messages.getString("JavaBeanPropertiesSection.TypePropertyName").equalsIgnoreCase(pro.getName())) { //$NON-NLS-1$
return pro.getValue();
}
}
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/Messages.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/Messages.java 2008-11-06 14:09:01 UTC (rev 11581)
@@ -0,0 +1,22 @@
+package org.jboss.tools.smooks.javabean.ui;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages {
+ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.javabean.ui.messages"; //$NON-NLS-1$
+
+ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+ .getBundle(BUNDLE_NAME);
+
+ private Messages() {
+ }
+
+ public static String getString(String key) {
+ try {
+ return RESOURCE_BUNDLE.getString(key);
+ } catch (MissingResourceException e) {
+ return '!' + key + '!';
+ }
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/Messages.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/messages.properties (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/messages.properties 2008-11-06 14:09:01 UTC (rev 11581)
@@ -0,0 +1,19 @@
+JavaBeanConfigWizardPage.JavaBeanSelectionDialogDesc=Select the JavaBean class
+JavaBeanConfigWizardPage.JavaBeanSelectionDialogErrorMsg=Please select a Java project.
+JavaBeanConfigWizardPage.JavaBeanSelectionDialogTitle=JavaBean Class selection page
+JavaBeanModelLoadComposite.Browse=Browse...
+JavaBeanModelLoadComposite.ClassNameText=Class Name:
+JavaBeanModelLoadComposite.InitRunnableContextException=Can't init IRunnableContext
+JavaBeanModelLoadComposite.SearchJavaType=Search Java Type
+JavaBeanModelLoadComposite.SourceJavaBean=Source Java Bean:
+JavaBeanPropertiesSection.Browse=Browse
+JavaBeanPropertiesSection.ClassBrowse=Browse class
+JavaBeanPropertiesSection.CustomTypeBrowse=Browse custom type
+JavaBeanPropertiesSection.ErrorMessageTitle=Error
+JavaBeanPropertiesSection.JavaBeanProperties=JavaBean Properties
+JavaBeanPropertiesSection.JavaType=Java Type:
+JavaBeanPropertiesSection.MappingType=Mapping Type :
+JavaBeanPropertiesSection.SearchJavaType=Search Java Type
+JavaBeanPropertiesSection.TargetInstanceClass=Target instance class name :
+JavaBeanPropertiesSection.TypeDialogErrorMessage=can't open type selection dialog
+JavaBeanPropertiesSection.TypePropertyName=type
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ConnectionPropertySection.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ConnectionPropertySection.java 2008-11-06 13:44:53 UTC (rev 11580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ConnectionPropertySection.java 2008-11-06 14:09:01 UTC (rev 11581)
@@ -68,7 +68,7 @@
pgd.grabExcessVerticalSpace = true;
rootParent.setLayoutData(pgd);
Section section = factory.createSection(parent, Section.TITLE_BAR);
- section.setText("Mapping Properties");
+ section.setText(Messages.getString("ConnectionPropertySection.ConnectionPropertiesSecionText")); //$NON-NLS-1$
Composite mainComposite = factory.createComposite(section);
@@ -76,7 +76,7 @@
gridLayout.numColumns = 2;
mainComposite.setLayout(gridLayout);
tableViewer = new TableViewer(mainComposite);
- tableViewer.setColumnProperties(new String[] { "name", "value" });
+ tableViewer.setColumnProperties(new String[] { "name", "value" }); //$NON-NLS-1$ //$NON-NLS-2$
tableViewer.setCellEditors(new CellEditor[] {
new TextCellEditor(tableViewer.getTable()),
new TextCellEditor(tableViewer.getTable()) });
@@ -89,9 +89,9 @@
public Object getValue(Object element, String property) {
if (element instanceof PropertyModel) {
- if (property.equals("name"))
+ if (property.equals("name")) //$NON-NLS-1$
return ((PropertyModel) element).getName();
- if (property.equals("value"))
+ if (property.equals("value")) //$NON-NLS-1$
return ((PropertyModel) element).getValue();
}
return element;
@@ -104,11 +104,11 @@
}
if (element instanceof PropertyModel && value instanceof String) {
- if (property.equals("name")) {
+ if (property.equals("name")) { //$NON-NLS-1$
((PropertyModel) element).setName((String) value);
fireDirty();
}
- if (property.equals("value")) {
+ if (property.equals("value")) { //$NON-NLS-1$
((PropertyModel) element).setValue((String) value);
fireDirty();
}
@@ -157,11 +157,11 @@
});
nameColumn.getColumn().setWidth(100);
- nameColumn.getColumn().setText("Name");
+ nameColumn.getColumn().setText(Messages.getString("ConnectionPropertySection.NameColumnText")); //$NON-NLS-1$
TableViewerColumn valueColumn = new TableViewerColumn(tableViewer,
SWT.NONE);
valueColumn.getColumn().setWidth(100);
- valueColumn.getColumn().setText("Value");
+ valueColumn.getColumn().setText(Messages.getString("ConnectionPropertySection.ValueColumnText")); //$NON-NLS-1$
valueColumn.setLabelProvider(new CellLabelProvider() {
public void update(ViewerCell cell) {
@@ -182,7 +182,7 @@
GridLayout gl = new GridLayout();
buttonComposite.setLayout(gl);
- Button button1 = factory.createButton(buttonComposite, "New ",
+ Button button1 = factory.createButton(buttonComposite, Messages.getString("ConnectionPropertySection.NewButtonText"), //$NON-NLS-1$
SWT.NONE);
button1.addSelectionListener(new SelectionListener() {
@@ -192,8 +192,8 @@
public void widgetSelected(SelectionEvent e) {
PropertyModel model = new PropertyModel();
- model.setName("property");
- model.setValue("value");
+ model.setName("property"); //$NON-NLS-1$
+ model.setValue("value"); //$NON-NLS-1$
Object editPart = ((IStructuredSelection) getSelection())
.getFirstElement();
@@ -214,7 +214,7 @@
gd = new GridData(GridData.FILL_HORIZONTAL);
button1.setLayoutData(gd);
- Button button2 = factory.createButton(buttonComposite, "Delete ",
+ Button button2 = factory.createButton(buttonComposite, Messages.getString("ConnectionPropertySection.DeleteButtonText"), //$NON-NLS-1$
SWT.NONE);
gd = new GridData(GridData.FILL_HORIZONTAL);
button2.setLayoutData(gd);
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/Messages.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/Messages.java 2008-11-06 14:09:01 UTC (rev 11581)
@@ -0,0 +1,22 @@
+package org.jboss.tools.smooks.ui;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages {
+ private static final String BUNDLE_NAME = "org.jboss.tools.smooks.ui.messages"; //$NON-NLS-1$
+
+ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+ .getBundle(BUNDLE_NAME);
+
+ private Messages() {
+ }
+
+ public static String getString(String key) {
+ try {
+ return RESOURCE_BUNDLE.getString(key);
+ } catch (MissingResourceException e) {
+ return '!' + key + '!';
+ }
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/Messages.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksResourceChangeListener.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksResourceChangeListener.java 2008-11-06 13:44:53 UTC (rev 11580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksResourceChangeListener.java 2008-11-06 14:09:01 UTC (rev 11581)
@@ -53,7 +53,7 @@
private void deleteFile(IPath path) {
final IPath path1 = path;
- WorkspaceJob job = new WorkspaceJob("Delete file") {
+ WorkspaceJob job = new WorkspaceJob("Delete file") { //$NON-NLS-1$
public IStatus runInWorkspace(IProgressMonitor monitor)
throws CoreException {
@@ -71,7 +71,7 @@
private void newFile(IPath path, IPath newPath) {
final IPath path1 = path;
final IPath newPath1 = newPath;
- WorkspaceJob job = new WorkspaceJob("New file and delete old file") {
+ WorkspaceJob job = new WorkspaceJob("New file and delete old file") { //$NON-NLS-1$
public IStatus runInWorkspace(IProgressMonitor monitor)
throws CoreException {
IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(
@@ -81,9 +81,9 @@
.getFile(newPath1);
if (newFile.exists()) {
if (MessageDialog.openQuestion(new Shell(Display
- .getDefault()), "Cover", "File "
+ .getDefault()), Messages.getString("SmooksResourceChangeListener.CoverFile"), Messages.getString("SmooksResourceChangeListener.ConverFileMsg1") //$NON-NLS-1$ //$NON-NLS-2$
+ newFile.getFullPath()
- + " was exsiting , Cover the file?")) {
+ + Messages.getString("SmooksResourceChangeListener.ConverFileMsg2"))) { //$NON-NLS-1$
newFile.setContents(file.getContents(), true, true,
monitor);
}
@@ -106,7 +106,7 @@
public boolean visit(IResourceDelta delta) {
IResource res = delta.getResource();
String fileExtension = res.getFileExtension();
- if (!"smooks".equals(fileExtension)) {
+ if (!Messages.getString("SmooksResourceChangeListener.SmooksFileExtensionName").equals(fileExtension)) { //$NON-NLS-1$
return true;
}
int flags = delta.getFlags();
@@ -114,25 +114,25 @@
case IResourceDelta.ADDED:
if (flags == IResourceDelta.MOVED_FROM) {
IPath path = delta.getMovedFromPath();
- String fileName = "";
+ String fileName = ""; //$NON-NLS-1$
if (path != null) {
fileName = path.lastSegment();
- int dotIndex = fileName.lastIndexOf(".");
+ int dotIndex = fileName.lastIndexOf("."); //$NON-NLS-1$
if (dotIndex != -1) {
fileExtension = fileName.substring(dotIndex + 1,
fileName.length());
}
- if (!"smooks".equals(fileExtension)) {
+ if (!Messages.getString("SmooksResourceChangeListener.SmooksFileExtensionName").equals(fileExtension)) { //$NON-NLS-1$
return true;
}
- fileName += ".graph";
+ fileName += Messages.getString("SmooksResourceChangeListener.SmooksGraphFileExtensionName"); //$NON-NLS-1$
path = path.removeLastSegments(1);
path = path.append(fileName);
}
IPath newPath = res.getFullPath();
fileName = newPath.lastSegment();
- fileName += ".graph";
+ fileName += Messages.getString("SmooksResourceChangeListener.SmooksGraphFileExtensionName"); //$NON-NLS-1$
newPath = newPath.removeLastSegments(1).append(fileName);
newFile(path, newPath);
}
@@ -158,7 +158,7 @@
}
IPath path = res.getFullPath();
String fileName = path.lastSegment();
- fileName += ".graph";
+ fileName += Messages.getString("SmooksResourceChangeListener.SmooksGraphFileExtensionName"); //$NON-NLS-1$
path = path.removeLastSegments(1).append(fileName);
deleteFile(path);
break;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksTextEdtor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksTextEdtor.java 2008-11-06 13:44:53 UTC (rev 11580)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksTextEdtor.java 2008-11-06 14:09:01 UTC (rev 11581)
@@ -44,7 +44,7 @@
gd.horizontalSpan = 2;
noticeLabel.setLayoutData(gd);
noticeLabel
- .setText("Because there occurs some error during parse/load the Smooks configuration file , the graphical editor can't be opened.Error : ");
+ .setText(Messages.getString("SmooksTextEdtor.NotifyTitleMessage")); //$NON-NLS-1$
GridLayout gl = new GridLayout();
gl.numColumns = 2;
@@ -58,7 +58,7 @@
Label messageLabel = new Label(errorComposite, SWT.NONE);
String errorMessage = error.getLocalizedMessage();
- if(errorMessage == null ) errorMessage = "unknown error happen";
+ if(errorMessage == null ) errorMessage = Messages.getString("SmooksTextEdtor.UnKnownErrorMessage"); //$NON-NLS-1$
messageLabel.setText(errorMessage);
gd = new GridData(GridData.FILL_HORIZONTAL);
messageLabel.setLayoutData(gd);
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/messages.properties (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/messages.properties 2008-11-06 14:09:01 UTC (rev 11581)
@@ -0,0 +1,12 @@
+ConnectionPropertySection.ConnectionPropertiesSecionText=Mapping Properties
+ConnectionPropertySection.DeleteButtonText=Delete
+ConnectionPropertySection.NameColumnText=Name
+ConnectionPropertySection.NewButtonText=New
+ConnectionPropertySection.ValueColumnText=Value
+SmooksResourceChangeListener.ConverFileMsg1=File
+SmooksResourceChangeListener.ConverFileMsg2=\ was exsiting , Cover the file?
+SmooksResourceChangeListener.CoverFile=Cover
+SmooksResourceChangeListener.SmooksFileExtensionName=smooks
+SmooksResourceChangeListener.SmooksGraphFileExtensionName=.graph
+SmooksTextEdtor.NotifyTitleMessage=Because there occurs some error during parse/load the Smooks configuration file , the graphical editor can't be opened.Error :
+SmooksTextEdtor.UnKnownErrorMessage=unknown error happen
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 5 months
JBoss Tools SVN: r11580 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-11-06 08:44:53 -0500 (Thu, 06 Nov 2008)
New Revision: 11580
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3052
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2008-11-06 13:44:49 UTC (rev 11579)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2008-11-06 13:44:53 UTC (rev 11580)
@@ -73,14 +73,14 @@
int resType= res.getType();
if (resType != IResource.FILE) {
Property prop = getProperty(BasicHibernateProperties.HIBERNATE_CONFIG_FILE);
- IMessage message = new HibernateMessage(IMessage.HIGH_SEVERITY,
+ IMessage message = new Message(Messages.class.getName(), IMessage.HIGH_SEVERITY,
NOT_A_FILE, new String[]{configFile}, getResource());
message.setLineNo(prop.getValidationTextRange().getLineNumber());
messages.add(message);
}
} else {
Property prop = getProperty(BasicHibernateProperties.HIBERNATE_CONFIG_FILE);
- IMessage message = new HibernateMessage(IMessage.HIGH_SEVERITY,
+ IMessage message = new Message(Messages.class.getName(), IMessage.HIGH_SEVERITY,
FILE_NOT_FOUND, new String[]{configFile}, getResource());
message.setLineNo(prop.getValidationTextRange().getLineNumber());
messages.add(message);
@@ -88,18 +88,3 @@
}
}
}
-
-/*Fixes the problem with class loader*/
-class HibernateMessage extends Message {
-
- /**
- * @param aSeverity
- * @param anId
- * @param aParams
- * @param aTargetObject
- */
- public HibernateMessage(int aSeverity, String anId, String[] aParams, Object aTargetObject) {
- super(Messages.class.getName(), aSeverity, anId, aParams, aTargetObject);
- }
-
-}
17 years, 5 months
JBoss Tools SVN: r11579 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console: utils and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-11-06 08:44:49 -0500 (Thu, 06 Nov 2008)
New Revision: 11579
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfigurationPreferences.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3052
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfigurationPreferences.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfigurationPreferences.java 2008-11-06 13:44:45 UTC (rev 11578)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfigurationPreferences.java 2008-11-06 13:44:49 UTC (rev 11579)
@@ -142,6 +142,7 @@
private File pathToFile(IPath path) {
if(path==null) return null;
+ if (path.toFile().exists()) return path.toFile();
IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
return pathToFile(path.toString(), resource);
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2008-11-06 13:44:45 UTC (rev 11578)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2008-11-06 13:44:49 UTC (rev 11579)
@@ -29,6 +29,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Map.Entry;
/**
@@ -39,6 +40,7 @@
private Map dialectNames = new HashMap();
private Map connectionUrls = new HashMap();
private Map driverClasses = new HashMap();
+ private Map<String, String> driverToDialect = new HashMap<String, String>();
public DriverClassHelpers() {
// externalize this!
@@ -238,6 +240,7 @@
String url = urls[i];
add(connectionUrls, driverclass, url);
}
+ driverToDialect.put(driverclass, dialect);
}
/**
@@ -269,6 +272,10 @@
return null;
}
+ public String getDialect(String driverclass) {
+ return driverToDialect.get(driverclass);
+ }
+
/**
*
* @param dialectName
17 years, 5 months
JBoss Tools SVN: r11578 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-11-06 08:44:45 -0500 (Thu, 06 Nov 2008)
New Revision: 11578
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3052
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java 2008-11-06 13:35:23 UTC (rev 11577)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java 2008-11-06 13:44:45 UTC (rev 11578)
@@ -33,15 +33,12 @@
private JpaProject jpaProject;
- private IStructuredSelection selection;
-
private GenerateDdlWizardPage initPage;
public GenerateDdlWizard(JpaProject jpaProject, IStructuredSelection selection) {
super();
this.jpaProject = jpaProject;
- this.selection = selection;
this.setWindowTitle( JptUiMessages.GenericPlatformUiDialog_notSupportedMessageTitle);
}
@@ -63,7 +60,6 @@
Map<String, String> prop = new HashMap<String, String>();
prop.put("outputFileName", initPage.getFilename());
- //prop.put("outputdir", project.getName() + "\\src");
prop.put("format", "true");
prop.put("scriptToConsole", "false");
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java 2008-11-06 13:35:23 UTC (rev 11577)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java 2008-11-06 13:44:45 UTC (rev 11578)
@@ -92,7 +92,7 @@
protected void dialogChanged() {
- setMessage("");
+ setErrorMessage(null);
/*validate package name*/
String packName= getPackageName();
if (packName.length() > 0) {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2008-11-06 13:35:23 UTC (rev 11577)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2008-11-06 13:44:45 UTC (rev 11578)
@@ -10,30 +10,28 @@
******************************************************************************/
package org.jboss.tools.hibernate.jpt.ui.wizard;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Properties;
-import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.core.PackageFragmentRoot;
-import org.eclipse.jdt.internal.ui.wizards.NewWizardMessages;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.ComboDialogField;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.jpt.core.JpaProject;
import org.eclipse.jpt.ui.internal.JptUiMessages;
@@ -47,15 +45,16 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
-import org.hibernate.cfg.Environment;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
+import org.hibernate.console.preferences.ConsoleConfigurationPreferences;
import org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode;
+import org.hibernate.eclipse.console.EclipseConsoleConfigurationPreferences;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
-import org.hibernate.eclipse.launch.ICodeGenerationLaunchConstants;
-import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants;
+import org.hibernate.eclipse.console.utils.DriverClassHelpers;
import org.hibernate.tool.hbm2x.StringUtils;
import org.hibernate.util.StringHelper;
+import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibernateProperties;
import org.jboss.tools.hibernate.jpt.ui.HibernateJptUIPlugin;
/**
@@ -64,12 +63,18 @@
*/
public abstract class GenerateInitWizardPage extends WizardPage {
+ private static final String AUTODETECT = "[Autodetect]";
+
+ private DriverClassHelpers helper = new DriverClassHelpers();
+
private ComboDialogField connectionProfileName;
private StringButtonDialogField schemaName;
private ComboDialogField consoleConfigurationName;
+ private ComboDialogField dialectName;
+
private Button selectMethod;
private Group dbGroup;
@@ -102,6 +107,12 @@
createChildControls(container);
+ dialectName = new ComboDialogField(SWT.NONE);
+ dialectName.setLabelText(HibernateConsoleMessages.NewConfigurationWizardPage_database_dialect);
+ dialectName.setItems(getDialectNames());
+ dialectName.selectItem(0);
+ dialectName.doFillIntoGrid(container, numColumns);
+
selectMethod = new Button(container, SWT.CHECK);
selectMethod.setText("Use Console Configuration");
selectMethod.setSelection(true);
@@ -116,14 +127,11 @@
consoleConfigurationName.setEnabled(selectMethod.getSelection());
connectionProfileName.setEnabled(!selectMethod.getSelection());
schemaName.setEnabled(!selectMethod.getSelection());
- if (!selectMethod.getSelection()){
- setMessage("Hibernate dialect is not specified", WARNING);
- }
dialogChanged();
}});
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = numColumns;
- selectMethod.setLayoutData(gd);
+ selectMethod.setLayoutData(gd);
consoleConfigurationName = new ComboDialogField(SWT.READ_ONLY);
consoleConfigurationName.setLabelText(HibernateConsoleMessages.CodeGenerationSettingsTab_console_configuration);
@@ -234,78 +242,47 @@
return connectionProfileName.getText();
}
- private String createConsoleConfiguration(){
+ private String createConsoleConfiguration(){
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
- ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType( ICodeGenerationLaunchConstants.CONSOLE_CONFIGURATION_LAUNCH_TYPE_ID );
- String launchName = launchManager.generateUniqueLaunchConfigurationNameFrom(HibernateConsoleMessages.AddConfigurationAction_hibernate);
- //ILaunchConfiguration[] launchConfigurations = launchManager.getLaunchConfigurations( launchConfigurationType );
- ILaunchConfigurationWorkingCopy wc = null;
- try {
- wc = launchConfigurationType.newInstance(null, launchName);
-
- wc.setAttributes(getProperties());
-
- wc.setAttribute(IConsoleConfigurationLaunchConstants.CONFIGURATION_FACTORY, ConfigurationMode.JPA.toString());
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, nonEmptyTrimOrNull( jpaProject.getName() ));
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true );
- wc.setAttribute(IConsoleConfigurationLaunchConstants.FILE_MAPPINGS, (List)null);
- //wc.setAttribute("hibernate.temp.use_jdbc_metadata_defaults", true);
- //wc.setAttribute(IConsoleConfigurationLaunchConstants.USE_CONNECT_PROFILE_SETTINGS, true);
- //wc.setAttribute(IConsoleConfigurationLaunchConstants.CONNECT_PROFILE_NAME, getConnectionProfileName());
- wc.doSave();
- return wc.getName();
- } catch (CoreException e) {
- HibernateJptUIPlugin.logException(e);
- return null;
- }
-
- }
-
- /**
- * @param name
- * @return
- */
- private String nonEmptyTrimOrNull(String name) {
- if(StringHelper.isEmpty( name )) {
- return null;
- } else {
- return name.trim();
- }
- }
-
- private Properties getProperties(){
- Properties prop = new Properties();
- IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName());
- if (null != profile) {
- Properties cpProperties = profile.getProperties(profile.getProviderId());
- Map<String, String> keyMaps = new HashMap<String, String>();
- keyMaps.put(Environment.DRIVER, "org.eclipse.datatools.connectivity.db.driverClass");
- keyMaps.put(Environment.URL, "org.eclipse.datatools.connectivity.db.URL");
- keyMaps.put(Environment.USER, "org.eclipse.datatools.connectivity.db.username");
- keyMaps.put(Environment.PASS, "org.eclipse.datatools.connectivity.db.password");
- keyMaps.put(Environment.DEFAULT_CATALOG, "org.eclipse.datatools.connectivity.db.databaseName");
- copyProperties(cpProperties, prop, keyMaps);
+ String dialect = determineDialect();
+ IPath propPath = null;
+ if (dialect != null) {
+ OutputStream out = null;
+ try{
+ String propName = HibernateConsoleMessages.AddConfigurationAction_hibernate + ".properties";
+ propPath = HibernateJptUIPlugin.getDefault().getStateLocation().append(propName);
+ File file = propPath.toFile();
+ file.createNewFile();
+ out = new FileOutputStream(file);
+ Properties p = new Properties();
+ p.setProperty(BasicHibernateProperties.HIBERNATE_DIALECT, determineDialect());
+ p.store(out, null);
+ } catch(IOException e){
+
+ } finally {
+ if (out != null){
+ try {
+ out.close();
+ } catch (IOException e) {
+ }
+ }
}
- return prop;
- }
-
- /**
- *
- * @param source
- * @param dest
- * @param map - key is the key in <code>dest</code> map, value is the key in <code>source</code> map.
- */
- private void copyProperties(Properties source, Properties dest, Map<String, String> map){
- for (Map.Entry<String, String> entry : map.entrySet()) {
- putIfNotNull(dest, entry.getKey(), (String) source.get(entry.getValue()));
}
+
+ String ccName = launchManager.generateUniqueLaunchConfigurationNameFrom(HibernateConsoleMessages.AddConfigurationAction_hibernate);
+ ConsoleConfigurationPreferences prefs = new EclipseConsoleConfigurationPreferences(ccName,
+ ConfigurationMode.JPA, jpaProject.getName(), true,
+ null, null, propPath,
+ new IPath[0], new IPath[0], null, null,
+ getConnectionProfileName(), true);
+
+ ConsoleConfiguration cc = new ConsoleConfiguration(prefs);
+ KnownConfigurations.getInstance().addConfiguration(cc, false);
+
+ return ccName;
}
- private void putIfNotNull(Properties prop, String key, String value){
- if (StringHelper.isNotEmpty(value)) prop.put(key, value);
- }
-
public boolean isTemporaryConfiguration(){
return !selectMethod.getSelection();
}
@@ -336,4 +313,23 @@
return "";
}
}
+
+ private String[] getDialectNames(){
+ String[] dialectNames1 = helper.getDialectNames();
+ String[] dialectNames2 = new String[dialectNames1.length + 1];
+ dialectNames2[0] = AUTODETECT;
+ System.arraycopy(dialectNames1, 0, dialectNames2, 1, dialectNames1.length);
+ return dialectNames2;
+ }
+
+ private String determineDialect() {
+ if (!AUTODETECT.equals(dialectName.getText()))
+ return helper.getDialectClass(dialectName.getText());
+ if (!selectMethod.getSelection()){
+ IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName());
+ String driver = profile.getProperties(profile.getProviderId()).getProperty("org.eclipse.datatools.connectivity.db.driverClass");
+ return helper.getDialect(driver);
+ }
+ return null;
+ }
}
17 years, 5 months