Author: scabanovich
Date: 2012-01-24 18:00:07 -0500 (Tue, 24 Jan 2012)
New Revision: 38125
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/CDISeamConfigUIPlugin.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/CDISeamConfigUiImages.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/SeamConfigXmlCompletionProposalComputer.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
CDISeamConfigUIPlugin is modified to follow the common pattern.
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/CDISeamConfigUIPlugin.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/CDISeamConfigUIPlugin.java 2012-01-24
22:52:44 UTC (rev 38124)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/CDISeamConfigUIPlugin.java 2012-01-24
23:00:07 UTC (rev 38125)
@@ -10,23 +10,13 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.config.ui;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
+import org.jboss.tools.common.log.BaseUIPlugin;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-public class CDISeamConfigUIPlugin extends AbstractUIPlugin{
+public class CDISeamConfigUIPlugin extends BaseUIPlugin {
//The shared instance.
private static CDISeamConfigUIPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
public static final String PLUGIN_ID = "org.jboss.tools.cdi.seam.config.ui";
//$NON-NLS-1$
-
/**
* The constructor.
@@ -42,45 +32,4 @@
return plugin;
}
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle= CDISeamConfigUIPlugin.getDefault().getResourceBundle();
- try {
- return bundle.getString(key);
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- static public void log(String msg) {
- CDISeamConfigUIPlugin.getDefault().getLog().log(new Status(Status.INFO, PLUGIN_ID,
Status.OK, msg, null));
- }
-
- public static void log(IStatus status) {
- CDISeamConfigUIPlugin.getDefault().getLog().log(status);
- }
- public static void log(String message, Exception exception) {
- CDISeamConfigUIPlugin.getDefault().getLog().log(new Status(Status.ERROR,
CDISeamConfigUIPlugin.PLUGIN_ID, Status.OK, message, exception));
- }
- static public void log(Exception ex) {
- CDISeamConfigUIPlugin.getDefault().getLog().log(new Status(Status.ERROR,
CDISeamConfigUIPlugin.PLUGIN_ID, Status.OK, CDISeamConfigUIMessages.NO_MESSAGE, ex));
- }
-
}
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/CDISeamConfigUiImages.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/CDISeamConfigUiImages.java 2012-01-24
22:52:44 UTC (rev 38124)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/CDISeamConfigUiImages.java 2012-01-24
23:00:07 UTC (rev 38125)
@@ -26,7 +26,7 @@
try {
INSTANCE = new CDISeamConfigUiImages(new
URL(CDISeamConfigUIPlugin.getDefault().getBundle().getEntry("/"),
"icons/")); //$NON-NLS-1$ //$NON-NLS-2$
} catch (MalformedURLException e) {
- CDISeamConfigUIPlugin.log(e);
+ CDISeamConfigUIPlugin.getDefault().logError(e);
}
}
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/SeamConfigXmlCompletionProposalComputer.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/SeamConfigXmlCompletionProposalComputer.java 2012-01-24
22:52:44 UTC (rev 38124)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/SeamConfigXmlCompletionProposalComputer.java 2012-01-24
23:00:07 UTC (rev 38125)
@@ -241,7 +241,7 @@
try {
member = Util.resolveMember(contextType, sax);
} catch (JavaModelException e) {
- CDISeamConfigUIPlugin.log(e);
+ CDISeamConfigUIPlugin.getDefault().logError(e);
}
if(member != null) {
//We are inside bean member. Suggest annotations and <value>.
@@ -274,7 +274,7 @@
}
tagData.addAll(append);
} catch (JavaModelException e) {
- CDISeamConfigUIPlugin.log(e);
+ CDISeamConfigUIPlugin.getDefault().logError(e);
}
}
@@ -366,7 +366,7 @@
proposedInfo = JavadocContentAccess2.getHTMLContent(member, true);
if(proposedInfo == null) proposedInfo = "";
} catch (JavaModelException e) {
- CDISeamConfigUIPlugin.log(e);
+ CDISeamConfigUIPlugin.getDefault().logError(e);
}
}
return proposedInfo;
@@ -431,7 +431,7 @@
try {
packages = getAllPackages(javaProject);
} catch (JavaModelException e) {
- CDISeamConfigUIPlugin.log(e);
+ CDISeamConfigUIPlugin.getDefault().logError(e);
}
packages.add(PACKAGE_EE);
for (String pkg: packages) {
@@ -605,7 +605,7 @@
}
}
} catch (JavaModelException e) {
- CDISeamConfigUIPlugin.log(e);
+ CDISeamConfigUIPlugin.getDefault().logError(e);
}
return result;
}