Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseberle2009-06-14 21:03:11 +0000
committerseberle2009-06-14 21:03:11 +0000
commit6d064dfd95bf06f658b657c0a7953a3beb081982 (patch)
tree4d36c222962656e1c09228a6ec17bde731c9bc24
parent91470957ba4b49becc2020c9e3fa2665af163f1f (diff)
downloadorg.eclipse.emf.teneo-6d064dfd95bf06f658b657c0a7953a3beb081982.tar.gz
org.eclipse.emf.teneo-6d064dfd95bf06f658b657c0a7953a3beb081982.tar.xz
org.eclipse.emf.teneo-6d064dfd95bf06f658b657c0a7953a3beb081982.zip
[275739] Externalize strings in Teneo EclipseLink plug-ins
-rw-r--r--plugins/org.eclipse.emf.teneo.eclipselink.ui/.settings/org.eclipse.jdt.core.prefs64
-rw-r--r--plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/EclipseLinkLoadModelFromDatabaseWizard.java6
-rw-r--r--plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/pages/EclipseLinkModelAndDatabaseAccessParametersPage.java10
-rw-r--r--plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/pages/EclipseLinkRootObjectAndModelEditorPage.java18
4 files changed, 80 insertions, 18 deletions
diff --git a/plugins/org.eclipse.emf.teneo.eclipselink.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.teneo.eclipselink.ui/.settings/org.eclipse.jdt.core.prefs
index c4bcee03e..391b3741b 100644
--- a/plugins/org.eclipse.emf.teneo.eclipselink.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.teneo.eclipselink.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,72 @@
-#Fri May 22 22:39:38 CEST 2009
+#Sat Jun 13 14:26:23 CEST 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
diff --git a/plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/EclipseLinkLoadModelFromDatabaseWizard.java b/plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/EclipseLinkLoadModelFromDatabaseWizard.java
index c271c01ed..1289c75df 100644
--- a/plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/EclipseLinkLoadModelFromDatabaseWizard.java
+++ b/plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/EclipseLinkLoadModelFromDatabaseWizard.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.teneo.eclipselink.common.ui.wizards.AbstractLoadModelFromDatabaseWizard;
import org.eclipse.emf.teneo.eclipselink.common.ui.wizards.pages.AbstractRootObjectAndModelEditorPage;
import org.eclipse.emf.teneo.eclipselink.common.ui.wizards.pages.BasicModelAndDatabaseAccessParametersPage;
-import org.eclipse.emf.teneo.eclipselink.resource.EclipseLinkResourceUtil;
+import org.eclipse.emf.teneo.eclipselink.resource.EclipseLinkURIUtil;
import org.eclipse.emf.teneo.eclipselink.ui.wizards.pages.EclipseLinkModelAndDatabaseAccessParametersPage;
import org.eclipse.emf.teneo.eclipselink.ui.wizards.pages.EclipseLinkRootObjectAndModelEditorPage;
@@ -33,7 +33,7 @@ public class EclipseLinkLoadModelFromDatabaseWizard extends AbstractLoadModelFro
@Override
protected URI createDatabaseURI(String persistenceUnitName, EObject rootObject) {
- String query = EclipseLinkResourceUtil.createContentsExampleQuery(rootObject);
- return EclipseLinkResourceUtil.createEclipseLinkURI(persistenceUnitName, query);
+ String query = EclipseLinkURIUtil.createContentsExampleQuery(rootObject);
+ return EclipseLinkURIUtil.createEclipseLinkURI(persistenceUnitName, query);
}
}
diff --git a/plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/pages/EclipseLinkModelAndDatabaseAccessParametersPage.java b/plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/pages/EclipseLinkModelAndDatabaseAccessParametersPage.java
index 350a1352c..889c90e87 100644
--- a/plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/pages/EclipseLinkModelAndDatabaseAccessParametersPage.java
+++ b/plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/pages/EclipseLinkModelAndDatabaseAccessParametersPage.java
@@ -36,10 +36,10 @@ public class EclipseLinkModelAndDatabaseAccessParametersPage extends BasicModelA
@Override
protected void updateDatabaseLoginFieldsFromPersistenceUnit() {
String name = persistenceUnitNameField.getText();
- databaseURLField.setText(getPersistenceUnitProperty(name, "eclipselink.jdbc.url"));
- jdbcDriverField.setText(getPersistenceUnitProperty(name, "eclipselink.jdbc.driver"));
- userNameField.setText(getPersistenceUnitProperty(name, "eclipselink.jdbc.user"));
- passwordField.setText(getPersistenceUnitProperty(name, "eclipselink.jdbc.password"));
+ databaseURLField.setText(getPersistenceUnitProperty(name, "eclipselink.jdbc.url")); //$NON-NLS-1$
+ jdbcDriverField.setText(getPersistenceUnitProperty(name, "eclipselink.jdbc.driver")); //$NON-NLS-1$
+ userNameField.setText(getPersistenceUnitProperty(name, "eclipselink.jdbc.user")); //$NON-NLS-1$
+ passwordField.setText(getPersistenceUnitProperty(name, "eclipselink.jdbc.password")); //$NON-NLS-1$
}
protected Map<String, PersistenceUnitInfo> getPersistenceUnits() {
@@ -58,7 +58,7 @@ public class EclipseLinkModelAndDatabaseAccessParametersPage extends BasicModelA
}
protected String getPersistenceUnitProperty(String persistenceUnitName, String propertyName) {
- String result = "";
+ String result = ""; //$NON-NLS-1$
PersistenceUnitInfo persistenceUnit = getPersistenceUnits().get(persistenceUnitName);
if (persistenceUnit != null) {
if (persistenceUnit.getProperties().containsKey(propertyName)) {
diff --git a/plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/pages/EclipseLinkRootObjectAndModelEditorPage.java b/plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/pages/EclipseLinkRootObjectAndModelEditorPage.java
index abb763321..95ccdd32e 100644
--- a/plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/pages/EclipseLinkRootObjectAndModelEditorPage.java
+++ b/plugins/org.eclipse.emf.teneo.eclipselink.ui/src/org/eclipse/emf/teneo/eclipselink/ui/wizards/pages/EclipseLinkRootObjectAndModelEditorPage.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.teneo.eclipselink.common.ui.wizards.pages.AbstractRootObjectAndModelEditorPage;
-import org.eclipse.emf.teneo.eclipselink.resource.EclipseLinkResourceUtil;
+import org.eclipse.emf.teneo.eclipselink.resource.EclipseLinkURIUtil;
import org.eclipse.persistence.config.PersistenceUnitProperties;
public class EclipseLinkRootObjectAndModelEditorPage extends AbstractRootObjectAndModelEditorPage {
@@ -28,14 +28,14 @@ public class EclipseLinkRootObjectAndModelEditorPage extends AbstractRootObjectA
@Override
protected URI createDatabaseURI(String persistenceUnitName, EClass eClass) {
- String query = EclipseLinkResourceUtil.createContentsInstancesOfQuery(eClass);
- return EclipseLinkResourceUtil.createEclipseLinkURI(persistenceUnitName, query);
+ String query = EclipseLinkURIUtil.createContentsInstancesOfQuery(eClass);
+ return EclipseLinkURIUtil.createEclipseLinkURI(persistenceUnitName, query);
}
@Override
protected URI createDatabaseURI(String persistenceUnitName, EObject eObject) {
- String query = EclipseLinkResourceUtil.createContentsExampleQuery(eObject);
- return EclipseLinkResourceUtil.createEclipseLinkURI(persistenceUnitName, query);
+ String query = EclipseLinkURIUtil.createContentsExampleQuery(eObject);
+ return EclipseLinkURIUtil.createEclipseLinkURI(persistenceUnitName, query);
}
@Override
@@ -48,10 +48,10 @@ public class EclipseLinkRootObjectAndModelEditorPage extends AbstractRootObjectA
@Override
protected Map<String, Object> getDatabaseLoginOptionsFromPreviousPage() {
Map<String, Object> result = new HashMap<String, Object>();
- result.put("eclipselink.jdbc.url", getTypedPreviousPage().getDatabaseURL());
- result.put("eclipselink.jdbc.driver", getTypedPreviousPage().getJDBCDriver());
- result.put("eclipselink.jdbc.user", getTypedPreviousPage().getUserName());
- result.put("eclipselink.jdbc.password", getTypedPreviousPage().getPassword());
+ result.put("eclipselink.jdbc.url", getTypedPreviousPage().getDatabaseURL()); //$NON-NLS-1$
+ result.put("eclipselink.jdbc.driver", getTypedPreviousPage().getJDBCDriver()); //$NON-NLS-1$
+ result.put("eclipselink.jdbc.user", getTypedPreviousPage().getUserName()); //$NON-NLS-1$
+ result.put("eclipselink.jdbc.password", getTypedPreviousPage().getPassword()); //$NON-NLS-1$
return result;
}
}

Back to the top