Fix eclipse code style warnings

* Fixes the accessing of constants. Should be directly from the interface rather then implementing classes * Fixes missing deprecation annotations
Teiid-Designer · Jul 13, 2012 · 3e3219b · 3e3219b
1 parent ab6693b
commit 3e3219b
Show file tree

Hide file tree

Showing 37 changed files with 168 additions and 161 deletions.
diff --git a/...ity.model/src/org/teiid/datatools/models/teiidsqlmodel/impl/TeiidsqlmodelFactoryImpl.java b/...ity.model/src/org/teiid/datatools/models/teiidsqlmodel/impl/TeiidsqlmodelFactoryImpl.java
@@ -10,12 +10,12 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.teiid.datatools.models.teiidsqlmodel.*;
+import org.teiid.datatools.models.teiidsqlmodel.Document;
+import org.teiid.datatools.models.teiidsqlmodel.TeiidSchema;
+import org.teiid.datatools.models.teiidsqlmodel.TeiidsqlmodelFactory;
+import org.teiid.datatools.models.teiidsqlmodel.TeiidsqlmodelPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -109,7 +109,8 @@ public TeiidsqlmodelPackage getTeiidsqlmodelPackage() {
 	 * @deprecated
 	 * @generated
 	 */
-	public static TeiidsqlmodelPackage getPackage() {
+	@Deprecated
+    public static TeiidsqlmodelPackage getPackage() {
 		return TeiidsqlmodelPackage.eINSTANCE;
 	}
 

diff --git a/...onnectivity.ui/src/org/teiid/datatools/connectivity/ui/TeiidProfileDetailsWizardPage.java b/...onnectivity.ui/src/org/teiid/datatools/connectivity/ui/TeiidProfileDetailsWizardPage.java
@@ -26,6 +26,7 @@
 import org.eclipse.datatools.connectivity.ui.wizards.IDriverUIContributorInformation;
 import org.eclipse.datatools.help.HelpUtil;
 import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -109,7 +110,7 @@ public void stateChanged(ChangeEvent e) {
 		if (driverCombo.getCombo().getItemCount() > 0) {
 			driverCombo.getCombo().select(0);
 		} else if (driverCombo.getErrorMessage() != null) {
-			setMessage(driverCombo.getErrorMessage(), DialogPage.INFORMATION);//ErrorMessage(driverCombo.getErrorMessage());
+			setMessage(driverCombo.getErrorMessage(), IMessageProvider.INFORMATION);//ErrorMessage(driverCombo.getErrorMessage());
 		}
 	}
 

diff --git a/...eiid.datatools.connectivity/src/org/teiid/datatools/connectivity/TeiidJDBCConnection.java b/...eiid.datatools.connectivity/src/org/teiid/datatools/connectivity/TeiidJDBCConnection.java
@@ -11,6 +11,7 @@
 import java.util.Properties;
 import org.eclipse.datatools.connectivity.IConnectionProfile;
 import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCConnectionProfileConstants;
+import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCDriverDefinitionConstants;
 import org.eclipse.datatools.connectivity.drivers.jdbc.JDBCConnection;
 
 public class TeiidJDBCConnection extends JDBCConnection {
@@ -33,14 +34,14 @@ protected Object createConnection( ClassLoader cl ) throws Throwable {
         // boolean hasDriver = (getDriverDefinition() != null);
         String driverClass = null;
         if (getDriverDefinition() != null) {
-            driverClass = getDriverDefinition().getProperty(IJDBCConnectionProfileConstants.DRIVER_CLASS_PROP_ID);
+            driverClass = getDriverDefinition().getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID);
         } else {
-            driverClass = props.getProperty(IJDBCConnectionProfileConstants.DRIVER_CLASS_PROP_ID);
+            driverClass = props.getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID);
         }
 
-        String connectURL = props.getProperty(IJDBCConnectionProfileConstants.URL_PROP_ID);
-        String uid = props.getProperty(IJDBCConnectionProfileConstants.USERNAME_PROP_ID);
-        String pwd = props.getProperty(IJDBCConnectionProfileConstants.PASSWORD_PROP_ID);
+        String connectURL = props.getProperty(IJDBCDriverDefinitionConstants.URL_PROP_ID);
+        String uid = props.getProperty(IJDBCDriverDefinitionConstants.USERNAME_PROP_ID);
+        String pwd = props.getProperty(IJDBCDriverDefinitionConstants.PASSWORD_PROP_ID);
         String nameValuePairs = props.getProperty(IJDBCConnectionProfileConstants.CONNECTION_PROPERTIES_PROP_ID);
         String propDelim = ",";//$NON-NLS-1$
 

diff --git a/...g.teiid.designer.advisor.ui/src/org/teiid/designer/advisor/ui/actions/NewModelAction.java b/...g.teiid.designer.advisor.ui/src/org/teiid/designer/advisor/ui/actions/NewModelAction.java
@@ -14,6 +14,7 @@
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.teiid.designer.advisor.ui.AdvisorUiConstants;
@@ -84,7 +85,7 @@ public void run() {
             wizard.init(iww.getWorkbench(), (IStructuredSelection)theSelection);
             WizardDialog dialog = new WizardDialog(iww.getShell(), wizard);
             int result = dialog.open();
-            if (result == Dialog.OK) {
+            if (result == Window.OK) {
                 successful = true;
             }
         } catch (Exception e) {

diff --git a/...esigner.advisor.ui/src/org/teiid/designer/advisor/ui/views/guides/TeiidGuidesSection.java b/...esigner.advisor.ui/src/org/teiid/designer/advisor/ui/views/guides/TeiidGuidesSection.java
@@ -78,7 +78,7 @@ public TeiidGuidesSection(FormToolkit toolkit, Composite parent) {
 	@SuppressWarnings("unused")
 	private void createSection(Composite theParent) {
 		SECTION : {
-	        section = this.toolkit.createSection(theParent, Section.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED );
+	        section = this.toolkit.createSection(theParent, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED );
 	        Color bkgdColor = this.toolkit.getColors().getBackground();
 	        section.setText(Messages.ActionSets);
 	        section.setTitleBarForeground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_BLUE));

diff --git a/...igner.advisor.ui/src/org/teiid/designer/advisor/ui/views/status/AdvisorStatusManager.java b/...igner.advisor.ui/src/org/teiid/designer/advisor/ui/views/status/AdvisorStatusManager.java
@@ -72,7 +72,7 @@ public AdvisorStatusManager() {
     }
 
     private void init() {
-        this.helper = new StatusValidationHelper();
+        AdvisorStatusManager.helper = new StatusValidationHelper();
         this.statusListeners = new ArrayList();
         this.autoBuildJobListener = new AutoBuildJobListener();
         // viewWorker = VdbViewUtil.getVdbViewWorker();

diff --git a/...igner.advisor.ui/src/org/teiid/designer/advisor/ui/views/status/ProjectStatusSection.java b/...igner.advisor.ui/src/org/teiid/designer/advisor/ui/views/status/ProjectStatusSection.java
@@ -21,6 +21,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Section;
 import org.teiid.core.util.CoreArgCheck;
@@ -92,7 +93,7 @@ private void createSection(Composite parent) {
 
         SECTION : {
 	        this.section = this.toolkit.createSection(parent, 
-	        		Section.TITLE_BAR | Section.COMPACT ); //| Section.TWISTIE | Section.EXPANDED  );
+	        		ExpandableComposite.TITLE_BAR | ExpandableComposite.COMPACT ); //| Section.TWISTIE | Section.EXPANDED  );
 
 	        section.setExpanded(false);
 	        section.setText(Messages.Status);

diff --git a/...tools.ui/src/org/teiid/designer/datatools/profiles/modeshape/ConnectionProfileWizard.java b/...tools.ui/src/org/teiid/designer/datatools/profiles/modeshape/ConnectionProfileWizard.java
@@ -1,13 +1,14 @@
 package org.teiid.designer.datatools.profiles.modeshape;
 
 import org.eclipse.datatools.connectivity.ui.wizards.ExtensibleNewConnectionProfileWizard;
+import org.teiid.designer.datatools.ui.DatatoolsUiConstants;
 import org.teiid.designer.datatools.ui.DatatoolsUiPlugin;
 
 public class ConnectionProfileWizard extends ExtensibleNewConnectionProfileWizard {
 
     public ConnectionProfileWizard() {
         super(new  ModeShapeProfileDetailsWizardPage("detailsPage")); //$NON-NLS-1$
-		setWindowTitle(DatatoolsUiPlugin.UTIL.getString(
+		setWindowTitle(DatatoolsUiConstants.UTIL.getString(
 				"ConnectionProfileWizard.ModeShape.WizardTitle")); //$NON-NLS-1$
     }
 }
diff --git a/....ui/src/org/teiid/designer/datatools/profiles/modeshape/ModeShapeDriverUIContributor.java b/....ui/src/org/teiid/designer/datatools/profiles/modeshape/ModeShapeDriverUIContributor.java
@@ -31,51 +31,50 @@
 import org.eclipse.swt.widgets.TabItem;
 import org.eclipse.swt.widgets.Text;
 import org.teiid.designer.datatools.ui.DatatoolsUiConstants;
-import org.teiid.designer.datatools.ui.DatatoolsUiPlugin;
 import org.teiid.designer.ui.common.util.WidgetFactory;
 
 
 public class ModeShapeDriverUIContributor implements IDriverUIContributor, Listener {
 
-    private static final String HOST_LBL_UI_ = DatatoolsUiPlugin.UTIL.getString("Common.HOST_LBL_UI_"); //$NON-NLS-1$
+    private static final String HOST_LBL_UI_ = DatatoolsUiConstants.UTIL.getString("Common.HOST_LBL_UI_"); //$NON-NLS-1$
 
-    private static final String PORT_LBL_UI_ = DatatoolsUiPlugin.UTIL.getString("Common.PORT_LBL_UI_"); //$NON-NLS-1$
+    private static final String PORT_LBL_UI_ = DatatoolsUiConstants.UTIL.getString("Common.PORT_LBL_UI_"); //$NON-NLS-1$
 
-    private static final String CONNECTIONURL_LBL_UI_ = DatatoolsUiPlugin.UTIL.getString("Common.CONNECTIONURL_LBL_UI_"); //$NON-NLS-1$
+    private static final String CONNECTIONURL_LBL_UI_ = DatatoolsUiConstants.UTIL.getString("Common.CONNECTIONURL_LBL_UI_"); //$NON-NLS-1$
 
-    private static final String USERNAME_LBL_UI_ = DatatoolsUiPlugin.UTIL.getString("Common.USERNAME_LBL_UI_"); //$NON-NLS-1$
+    private static final String USERNAME_LBL_UI_ = DatatoolsUiConstants.UTIL.getString("Common.USERNAME_LBL_UI_"); //$NON-NLS-1$
 
-    private static final String PASSWORD_LBL_UI_ = DatatoolsUiPlugin.UTIL.getString("Common.PASSWORD_LBL_UI_"); //$NON-NLS-1$
+    private static final String PASSWORD_LBL_UI_ = DatatoolsUiConstants.UTIL.getString("Common.PASSWORD_LBL_UI_"); //$NON-NLS-1$
 
-    private static final String SSL_BTN_UI_ = DatatoolsUiPlugin.UTIL.getString("Common.SSL_BTN_UI_"); //$NON-NLS-1$
+    private static final String SSL_BTN_UI_ = DatatoolsUiConstants.UTIL.getString("Common.SSL_BTN_UI_"); //$NON-NLS-1$
 
-    private static final String TEIID_BTN_UI_ = DatatoolsUiPlugin.UTIL.getString("Common.TEIID_BTN_UI_"); //$NON-NLS-1$
+    private static final String TEIID_BTN_UI_ = DatatoolsUiConstants.UTIL.getString("Common.TEIID_BTN_UI_"); //$NON-NLS-1$
 
-    private static final String BROWSE_BUTTON_LBL_UI_ = DatatoolsUiPlugin.UTIL.getString("Common.BROWSE_BUTTON_LBL_UI_"); //$NON-NLS-1$
+    private static final String BROWSE_BUTTON_LBL_UI_ = DatatoolsUiConstants.UTIL.getString("Common.BROWSE_BUTTON_LBL_UI_"); //$NON-NLS-1$
 
-    private static final String SAVE_PASSWORD_LBL_UI_ = DatatoolsUiPlugin.UTIL.getString("Common.SAVE_PASSWORD_LBL_UI_"); //$NON-NLS-1$
+    private static final String SAVE_PASSWORD_LBL_UI_ = DatatoolsUiConstants.UTIL.getString("Common.SAVE_PASSWORD_LBL_UI_"); //$NON-NLS-1$
 
-	private static final String PATH_LBL_UI_ = DatatoolsUiPlugin.UTIL.getString("ModeShapeDriverUIContributor.REPOS.TXT"); //$NON-NLS-1$
+	private static final String PATH_LBL_UI_ = DatatoolsUiConstants.UTIL.getString("ModeShapeDriverUIContributor.REPOS.TXT"); //$NON-NLS-1$
 
-    private static final String HOST_SUMMARY_DATA_TEXT_ = DatatoolsUiPlugin.UTIL.getString("Common.summary.host"); //$NON-NLS-1$
+    private static final String HOST_SUMMARY_DATA_TEXT_ = DatatoolsUiConstants.UTIL.getString("Common.summary.host"); //$NON-NLS-1$
 
-    private static final String PORT_SUMMARY_DATA_TEXT_ = DatatoolsUiPlugin.UTIL.getString("Common.summary.port"); //$NON-NLS-1$
+    private static final String PORT_SUMMARY_DATA_TEXT_ = DatatoolsUiConstants.UTIL.getString("Common.summary.port"); //$NON-NLS-1$
 
-    private static final String USERNAME_SUMMARY_DATA_TEXT_ = DatatoolsUiPlugin.UTIL.getString("Common.summary.username"); //$NON-NLS-1$
+    private static final String USERNAME_SUMMARY_DATA_TEXT_ = DatatoolsUiConstants.UTIL.getString("Common.summary.username"); //$NON-NLS-1$
 
-    private static final String URL_SUMMARY_DATA_TEXT_ = DatatoolsUiPlugin.UTIL.getString("Common.summary.url"); //$NON-NLS-1$
+    private static final String URL_SUMMARY_DATA_TEXT_ = DatatoolsUiConstants.UTIL.getString("Common.summary.url"); //$NON-NLS-1$
 
-    private static final String SSL_SUMMARY_DATA_TEXT_ = DatatoolsUiPlugin.UTIL.getString("Common.summary.protocol"); //$NON-NLS-1$
+    private static final String SSL_SUMMARY_DATA_TEXT_ = DatatoolsUiConstants.UTIL.getString("Common.summary.protocol"); //$NON-NLS-1$
 
-    private static final String TEIID_SUMMARY_DATA_TEXT_ = DatatoolsUiPlugin.UTIL.getString("Common.summary.teiid"); //$NON-NLS-1$
+    private static final String TEIID_SUMMARY_DATA_TEXT_ = DatatoolsUiConstants.UTIL.getString("Common.summary.teiid"); //$NON-NLS-1$
 
-    private static final String SAVE_PASSWORD_SUMMARY_DATA_TEXT_ = DatatoolsUiPlugin.UTIL.getString("Common.summary.persistpassword.label"); //$NON-NLS-1$
+    private static final String SAVE_PASSWORD_SUMMARY_DATA_TEXT_ = DatatoolsUiConstants.UTIL.getString("Common.summary.persistpassword.label"); //$NON-NLS-1$
 
-    private static final String TRUE_SUMMARY_DATA_TEXT_ = DatatoolsUiPlugin.UTIL.getString("Common.summary.true"); //$NON-NLS-1$
+    private static final String TRUE_SUMMARY_DATA_TEXT_ = DatatoolsUiConstants.UTIL.getString("Common.summary.true"); //$NON-NLS-1$
 
-    private static final String FALSE_SUMMARY_DATA_TEXT_ = DatatoolsUiPlugin.UTIL.getString("Common.summary.false"); //$NON-NLS-1$
+    private static final String FALSE_SUMMARY_DATA_TEXT_ = DatatoolsUiConstants.UTIL.getString("Common.summary.false"); //$NON-NLS-1$
 
-	private static final String PATH_SUMMARY_DATA_TEXT_ = DatatoolsUiPlugin.UTIL.getString("Common.summary.path"); //$NON-NLS-1$
+	private static final String PATH_SUMMARY_DATA_TEXT_ = DatatoolsUiConstants.UTIL.getString("Common.summary.path"); //$NON-NLS-1$
 
 	private boolean isReadOnly = false;
 
@@ -401,19 +400,19 @@ public void setConnectionInformation() {
     public boolean determineContributorCompletion() {
         boolean isComplete = true;
         if (hostText.getText().trim().length() < 1) {
-            parentPage.setErrorMessage(DatatoolsUiPlugin.UTIL.getString("ModeShapeDriverUIContributor.VALIDATE_HOST_REQ_UI_")); //$NON-NLS-1$
+            parentPage.setErrorMessage(DatatoolsUiConstants.UTIL.getString("ModeShapeDriverUIContributor.VALIDATE_HOST_REQ_UI_")); //$NON-NLS-1$
             isComplete = false;
         } else if (portText.getText().trim().length() < 1) {
-            parentPage.setErrorMessage(DatatoolsUiPlugin.UTIL.getString("ModeShapeDriverUIContributor.VALIDATE_PORT_REQ_MSG_UI_")); //$NON-NLS-1$
+            parentPage.setErrorMessage(DatatoolsUiConstants.UTIL.getString("ModeShapeDriverUIContributor.VALIDATE_PORT_REQ_MSG_UI_")); //$NON-NLS-1$
             isComplete = false;
         } else if (usernameText.getText().trim().length() < 1) {
-            parentPage.setErrorMessage(DatatoolsUiPlugin.UTIL.getString("ModeShapeDriverUIContributor.VALIDATE_USERID_REQ_MSG_UI_")); //$NON-NLS-1$
+            parentPage.setErrorMessage(DatatoolsUiConstants.UTIL.getString("ModeShapeDriverUIContributor.VALIDATE_USERID_REQ_MSG_UI_")); //$NON-NLS-1$
             isComplete = false;
         } else if (passwordText.getText().trim().length() < 1) {
-            parentPage.setErrorMessage(DatatoolsUiPlugin.UTIL.getString("ModeShapeDriverUIContributor.VALIDATE_PASSWORD_REQ_MSG_UI_")); //$NON-NLS-1$
+            parentPage.setErrorMessage(DatatoolsUiConstants.UTIL.getString("ModeShapeDriverUIContributor.VALIDATE_PASSWORD_REQ_MSG_UI_")); //$NON-NLS-1$
             isComplete = false;
         } else if (reposCombo.getText().trim().length() < 1) {
-            parentPage.setErrorMessage(DatatoolsUiPlugin.UTIL.getString("ModeShapeDriverUIContributor.VALIDATE_PATH_REQ_UI_")); //$NON-NLS-1$
+            parentPage.setErrorMessage(DatatoolsUiConstants.UTIL.getString("ModeShapeDriverUIContributor.VALIDATE_PATH_REQ_UI_")); //$NON-NLS-1$
             isComplete = false;
         }
         if (isComplete) {

diff --git a/...eiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/PropertyPage.java b/...eiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/PropertyPage.java
@@ -27,9 +27,9 @@
 import org.eclipse.swt.widgets.Text;
 import org.teiid.designer.datatools.ui.DatatoolsUiConstants;
 import org.teiid.designer.datatools.ui.DatatoolsUiPlugin;
+import org.teiid.designer.ui.common.ICredentialsCommon;
 import org.teiid.designer.ui.common.ICredentialsCommon.SecurityType;
 
-
 public class PropertyPage extends ProfileDetailsPropertyPage implements
 		IContextProvider, DatatoolsUiConstants {
 
@@ -227,17 +227,17 @@ protected void validate() {
     private void initControls() {
         IConnectionProfile profile = getConnectionProfile();
         Properties props = profile.getBaseProperties();
-        if (null != props.get(IWSProfileConstants.USERNAME_PROP_ID)) {
-            usernameText.setText((String)props.get(IWSProfileConstants.USERNAME_PROP_ID));
+        if (null != props.get(ICredentialsCommon.USERNAME_PROP_ID)) {
+            usernameText.setText((String)props.get(ICredentialsCommon.USERNAME_PROP_ID));
         }
-        if (null != props.get(IWSProfileConstants.PASSWORD_PROP_ID)) {
-            passwordText.setText((String)props.get(IWSProfileConstants.PASSWORD_PROP_ID));
+        if (null != props.get(ICredentialsCommon.PASSWORD_PROP_ID)) {
+            passwordText.setText((String)props.get(ICredentialsCommon.PASSWORD_PROP_ID));
         }
         if (null != props.get(IWSProfileConstants.URL_PROP_ID)) {
             urlText.setText((String)props.get(IWSProfileConstants.URL_PROP_ID));
         }
-        if (null != props.get(IWSProfileConstants.SECURITY_TYPE_ID)) {
-            securityText.setText((String)props.get(IWSProfileConstants.SECURITY_TYPE_ID));
+        if (null != props.get(ICredentialsCommon.SECURITY_TYPE_ID)) {
+            securityText.setText((String)props.get(ICredentialsCommon.SECURITY_TYPE_ID));
         }
     }
 
@@ -253,9 +253,9 @@ protected Properties collectProperties() {
             result = new Properties();
         }
         result.setProperty(IWSProfileConstants.URL_PROP_ID, urlText.getText());
-        result.setProperty(IWSProfileConstants.SECURITY_TYPE_ID, securityText.getText());
-        result.setProperty(IWSProfileConstants.USERNAME_PROP_ID, usernameText.getText());
-        result.setProperty(IWSProfileConstants.PASSWORD_PROP_ID, passwordText.getText());
+        result.setProperty(ICredentialsCommon.SECURITY_TYPE_ID, securityText.getText());
+        result.setProperty(ICredentialsCommon.USERNAME_PROP_ID, usernameText.getText());
+        result.setProperty(ICredentialsCommon.PASSWORD_PROP_ID, passwordText.getText());
         return result;
     }