JBoss Tools SVN: r38134 - trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 18:29:53 -0500 (Tue, 24 Jan 2012)
New Revision: 38134
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java
trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLPlugin.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
CDIXMLPlugin is modified to follow the common pattern.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java 2012-01-24 23:26:19 UTC (rev 38133)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java 2012-01-24 23:29:53 UTC (rev 38134)
@@ -25,7 +25,7 @@
try {
INSTANCE = new CDIXMLImages(new URL(CDIXMLPlugin.getDefault().getBundle().getEntry("/"), "images/")); //$NON-NLS-1$ //$NON-NLS-2$
} catch (MalformedURLException e) {
- CDIXMLPlugin.log(e);
+ CDIXMLPlugin.getDefault().logError(e);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLPlugin.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLPlugin.java 2012-01-24 23:26:19 UTC (rev 38133)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLPlugin.java 2012-01-24 23:29:53 UTC (rev 38134)
@@ -10,43 +10,22 @@
******************************************************************************/
package org.jboss.tools.cdi.xml;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.jboss.tools.common.log.BaseUIPlugin;
/**
*/
-public class CDIXMLPlugin extends AbstractUIPlugin {
+public class CDIXMLPlugin extends BaseUIPlugin {
public static final String PLUGIN_ID = "org.jboss.tools.cdi.xml"; //$NON-NLS-1$
+ private static CDIXMLPlugin plugin = null;
+
public CDIXMLPlugin() {
super();
- INSTANCE = this;
+ plugin = this;
}
- public static void log(String msg) {
- if(isDebugEnabled()) INSTANCE.getLog().log(new Status(Status.INFO, PLUGIN_ID, Status.OK, msg, null));
- }
-
- public static void log(IStatus status) {
- if(isDebugEnabled() || !status.isOK()) INSTANCE.getLog().log(status);
- }
-
- public static void log(String message, Throwable exception) {
- INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, message, exception));
- }
-
- public static void log(Exception ex) {
- INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, CDIXMLMessages.SEAM_XML_PLUGIN_NO_MESSAGE, ex));
- }
-
- public static boolean isDebugEnabled() {
- return INSTANCE.isDebugging();
- }
-
public static CDIXMLPlugin getDefault() {
- return INSTANCE;
+ return plugin;
}
- static CDIXMLPlugin INSTANCE = null;
}
12 years, 5 months
JBoss Tools SVN: r38133 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 18:26:19 -0500 (Tue, 24 Jan 2012)
New Revision: 38133
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIPlugin.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
CDIUIPlugin is modified to follow the common pattern.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIPlugin.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIPlugin.java 2012-01-24 23:22:57 UTC (rev 38132)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIPlugin.java 2012-01-24 23:26:19 UTC (rev 38133)
@@ -11,7 +11,6 @@
package org.jboss.tools.cdi.ui;
import org.jboss.tools.common.log.BaseUIPlugin;
-import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
@@ -28,26 +27,9 @@
* The constructor
*/
public CDIUIPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
plugin = this;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
/**
* Returns the shared instance
*
12 years, 5 months
JBoss Tools SVN: r38132 - in trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext: hyperlink and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 18:22:57 -0500 (Tue, 24 Jan 2012)
New Revision: 38132
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsPlugin.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeanFilters.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/DisposerHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
CDIExtensionsPlugin is modified to follow the common pattern.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsPlugin.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsPlugin.java 2012-01-24 23:21:55 UTC (rev 38131)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsPlugin.java 2012-01-24 23:22:57 UTC (rev 38132)
@@ -10,23 +10,13 @@
******************************************************************************/
package org.jboss.tools.cdi.text.ext;
-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 CDIExtensionsPlugin extends AbstractUIPlugin{
+public class CDIExtensionsPlugin extends BaseUIPlugin {
//The shared instance.
private static CDIExtensionsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
public static final String PLUGIN_ID = "org.jboss.tools.cdi.text.ext"; //$NON-NLS-1$
-
/**
* The constructor.
@@ -42,46 +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= CDIExtensionsPlugin.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) {
- CDIExtensionsPlugin.getDefault().getLog().log(new Status(Status.INFO, PLUGIN_ID, Status.OK, msg, null));
- }
-
- public static void log(IStatus status) {
- CDIExtensionsPlugin.getDefault().getLog().log(status);
- }
- public static void log(String message, Exception exception) {
- CDIExtensionsPlugin.getDefault().getLog().log(new Status(Status.ERROR, CDIExtensionsPlugin.PLUGIN_ID, Status.OK, message, exception));
- }
- static public void log(Exception ex) {
- CDIExtensionsPlugin.getDefault().getLog().log(new Status(Status.ERROR, CDIExtensionsPlugin.PLUGIN_ID, Status.OK, CDIExtensionsMessages.CDI_EXT_PLUGIN_NO_MESSAGE, ex));
- }
-
-
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeanFilters.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeanFilters.java 2012-01-24 23:21:55 UTC (rev 38131)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeanFilters.java 2012-01-24 23:22:57 UTC (rev 38132)
@@ -107,7 +107,7 @@
FilterContributor f = (FilterContributor)c.createExecutableExtension("class");
s.add(f);
} catch (CoreException e) {
- CDIExtensionsPlugin.getDefault().log(e);
+ CDIExtensionsPlugin.getDefault().logError(e);
}
}
contributors = s.toArray(new FilterContributor[s.size()]);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/DisposerHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/DisposerHyperlink.java 2012-01-24 23:21:55 UTC (rev 38131)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/DisposerHyperlink.java 2012-01-24 23:22:57 UTC (rev 38132)
@@ -45,9 +45,9 @@
try{
part = JavaUI.openInEditor(method);
}catch(JavaModelException ex){
- CDIExtensionsPlugin.log(ex);
+ CDIExtensionsPlugin.getDefault().logError(ex);
}catch(PartInitException ex){
- CDIExtensionsPlugin.log(ex);
+ CDIExtensionsPlugin.getDefault().logError(ex);
}
if (part != null) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2012-01-24 23:21:55 UTC (rev 38131)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2012-01-24 23:22:57 UTC (rev 38132)
@@ -126,7 +126,7 @@
return (IHyperlink[])hyperlinks.toArray(new IHyperlink[hyperlinks.size()]);
}
} catch (JavaModelException jme) {
- CDIExtensionsPlugin.log(jme);
+ CDIExtensionsPlugin.getDefault().logError(jme);
}
return null;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2012-01-24 23:21:55 UTC (rev 38131)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2012-01-24 23:22:57 UTC (rev 38132)
@@ -50,9 +50,9 @@
try{
part = JavaUI.openInEditor(event.getClassBean().getBeanClass());
}catch(JavaModelException ex){
- CDIExtensionsPlugin.log(ex);
+ CDIExtensionsPlugin.getDefault().logError(ex);
}catch(PartInitException ex){
- CDIExtensionsPlugin.log(ex);
+ CDIExtensionsPlugin.getDefault().logError(ex);
}
IJavaElement element = event.getClassBean().getBeanClass();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2012-01-24 23:21:55 UTC (rev 38131)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2012-01-24 23:22:57 UTC (rev 38132)
@@ -57,9 +57,9 @@
try{
part = JavaUI.openInEditor(bean.getBeanClass());
}catch(JavaModelException ex){
- CDIExtensionsPlugin.log(ex);
+ CDIExtensionsPlugin.getDefault().logError(ex);
}catch(PartInitException ex){
- CDIExtensionsPlugin.log(ex);
+ CDIExtensionsPlugin.getDefault().logError(ex);
}
IJavaElement element = getJavaElement();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2012-01-24 23:21:55 UTC (rev 38131)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2012-01-24 23:22:57 UTC (rev 38132)
@@ -103,7 +103,7 @@
return (IHyperlink[])hyperlinks.toArray(new IHyperlink[hyperlinks.size()]);
}
} catch (JavaModelException jme) {
- CDIExtensionsPlugin.log(jme);
+ CDIExtensionsPlugin.getDefault().logError(jme);
}
return null;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2012-01-24 23:21:55 UTC (rev 38131)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2012-01-24 23:22:57 UTC (rev 38132)
@@ -46,9 +46,9 @@
try{
part = JavaUI.openInEditor(observerMethod.getClassBean().getBeanClass());
}catch(JavaModelException ex){
- CDIExtensionsPlugin.log(ex);
+ CDIExtensionsPlugin.getDefault().logError(ex);
}catch(PartInitException ex){
- CDIExtensionsPlugin.log(ex);
+ CDIExtensionsPlugin.getDefault().logError(ex);
}
IJavaElement element = observerMethod.getMethod();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java 2012-01-24 23:21:55 UTC (rev 38131)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java 2012-01-24 23:22:57 UTC (rev 38132)
@@ -118,7 +118,7 @@
return (IHyperlink[])hyperlinks.toArray(new IHyperlink[hyperlinks.size()]);
}
} catch (JavaModelException jme) {
- CDIExtensionsPlugin.log(jme);
+ CDIExtensionsPlugin.getDefault().logError(jme);
}
return null;
}
12 years, 5 months
JBoss Tools SVN: r38131 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 18:21:55 -0500 (Tue, 24 Jan 2012)
New Revision: 38131
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
CDIExtensionsPlugin is modified to follow the common pattern.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2012-01-24 23:14:55 UTC (rev 38130)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2012-01-24 23:21:55 UTC (rev 38131)
@@ -40,7 +40,7 @@
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.seam.solder.core.generic.GenericClassBean;
-import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin;
+import org.jboss.tools.cdi.seam.text.ext.CDISeamExtPlugin;
public class GenericInjectedPointHyperlinkDetector extends AbstractHyperlinkDetector{
protected IRegion region;
@@ -105,7 +105,7 @@
return (IHyperlink[])hyperlinks.toArray(new IHyperlink[hyperlinks.size()]);
}
} catch (JavaModelException jme) {
- CDIExtensionsPlugin.log(jme);
+ CDISeamExtPlugin.getDefault().logError(jme);
}
return null;
}
12 years, 5 months
JBoss Tools SVN: r38130 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext: hyperlink and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 18:14:55 -0500 (Tue, 24 Jan 2012)
New Revision: 38130
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/CDISeamExtPlugin.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/XMLInjectedPointHyperlinkDetector.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
CDISeamExtPlugin is modified to follow the common pattern.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/CDISeamExtPlugin.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/CDISeamExtPlugin.java 2012-01-24 23:11:23 UTC (rev 38129)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/CDISeamExtPlugin.java 2012-01-24 23:14:55 UTC (rev 38130)
@@ -10,23 +10,13 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.text.ext;
-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 CDISeamExtPlugin extends AbstractUIPlugin{
+public class CDISeamExtPlugin extends BaseUIPlugin {
//The shared instance.
private static CDISeamExtPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
- public static final String PLUGIN_ID = "org.jboss.tools.cdi.seam.text.ext"; //$NON-NLS-1$
-
+ public static final String PLUGIN_ID = "org.jboss.tools.cdi.seam.text.ext"; //$NON-NLS-1$
/**
* The constructor.
@@ -42,47 +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= CDISeamExtPlugin.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) {
- CDISeamExtPlugin.getDefault().getLog().log(new Status(Status.INFO, PLUGIN_ID, Status.OK, msg, null));
- }
-
- public static void log(IStatus status) {
- CDISeamExtPlugin.getDefault().getLog().log(status);
- }
- public static void log(String message, Exception exception) {
- CDISeamExtPlugin.getDefault().getLog().log(new Status(Status.ERROR, CDISeamExtPlugin.PLUGIN_ID, Status.OK, message, exception));
- }
- static public void log(Exception ex) {
- CDISeamExtPlugin.getDefault().getLog().log(new Status(Status.ERROR, CDISeamExtPlugin.PLUGIN_ID, Status.OK, CDISeamExtMessages.CDI_SEAM_EXT_PLUGIN_NO_MESSAGE, ex));
- }
-
-
-
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java 2012-01-24 23:11:23 UTC (rev 38129)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java 2012-01-24 23:14:55 UTC (rev 38130)
@@ -74,9 +74,9 @@
}
}
}catch(CoreException ex){
- CDISeamExtPlugin.log(ex);
+ CDISeamExtPlugin.getDefault().logError(ex);
}catch(BadLocationException ex){
- CDISeamExtPlugin.log(ex);
+ CDISeamExtPlugin.getDefault().logError(ex);
}
return null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/XMLInjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/XMLInjectedPointHyperlinkDetector.java 2012-01-24 23:11:23 UTC (rev 38129)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/XMLInjectedPointHyperlinkDetector.java 2012-01-24 23:14:55 UTC (rev 38130)
@@ -101,7 +101,7 @@
try{
elementFile = (IFile)element.getUnderlyingResource();
}catch(JavaModelException ex){
- CDISeamExtPlugin.log(ex);
+ CDISeamExtPlugin.getDefault().logError(ex);
}
if(elementFile != null)
12 years, 5 months
JBoss Tools SVN: r38129 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 18:11:23 -0500 (Tue, 24 Jan 2012)
New Revision: 38129
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCorePlugin.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
CDISeamSolderCorePlugin is modified to follow the common pattern.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCorePlugin.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCorePlugin.java 2012-01-24 23:10:17 UTC (rev 38128)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCorePlugin.java 2012-01-24 23:11:23 UTC (rev 38129)
@@ -11,7 +11,6 @@
package org.jboss.tools.cdi.seam.solder.core;
import org.jboss.tools.common.log.BaseUIPlugin;
-import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
@@ -19,7 +18,7 @@
public class CDISeamSolderCorePlugin extends BaseUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.cdi.seam.solder.core";
+ public static final String PLUGIN_ID = "org.jboss.tools.cdi.seam.solder.core"; //$NON-NLS-1$
// The shared instance
private static CDISeamSolderCorePlugin plugin;
@@ -28,26 +27,9 @@
* The constructor
*/
public CDISeamSolderCorePlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
plugin = this;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
/**
* Returns the shared instance
*
12 years, 5 months
JBoss Tools SVN: r38128 - trunk/jsf/tests/org.jboss.tools.jsf.base.test.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-01-24 18:10:17 -0500 (Tue, 24 Jan 2012)
New Revision: 38128
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.base.test/
Log:
Added target to svn:ignore
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test
___________________________________________________________________
Added: svn:ignore
+ target
12 years, 5 months
JBoss Tools SVN: r38127 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/src/org/jboss/tools/cdi/seam/faces/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 18:09:20 -0500 (Tue, 24 Jan 2012)
New Revision: 38127
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/src/org/jboss/tools/cdi/seam/faces/core/SeamFacesCorePlugin.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
SeamFacesCorePlugin is modified to follow the common pattern.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/src/org/jboss/tools/cdi/seam/faces/core/SeamFacesCorePlugin.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/src/org/jboss/tools/cdi/seam/faces/core/SeamFacesCorePlugin.java 2012-01-24 23:04:10 UTC (rev 38126)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/src/org/jboss/tools/cdi/seam/faces/core/SeamFacesCorePlugin.java 2012-01-24 23:09:20 UTC (rev 38127)
@@ -11,7 +11,6 @@
package org.jboss.tools.cdi.seam.faces.core;
import org.jboss.tools.common.log.BaseUIPlugin;
-import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
@@ -19,7 +18,7 @@
public class SeamFacesCorePlugin extends BaseUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.cdi.seam.faces.core";
+ public static final String PLUGIN_ID = "org.jboss.tools.cdi.seam.faces.core"; //$NON-NLS-1$
// The shared instance
private static SeamFacesCorePlugin plugin;
@@ -28,26 +27,9 @@
* The constructor
*/
public SeamFacesCorePlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
plugin = this;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
/**
* Returns the shared instance
*
12 years, 5 months
JBoss Tools SVN: r38126 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core: international/el and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 18:04:10 -0500 (Tue, 24 Jan 2012)
New Revision: 38126
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/CDISeamCorePlugin.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
CDISeamCorePlugin is modified to follow the common pattern.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/CDISeamCorePlugin.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/CDISeamCorePlugin.java 2012-01-24 23:00:07 UTC (rev 38125)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/CDISeamCorePlugin.java 2012-01-24 23:04:10 UTC (rev 38126)
@@ -11,7 +11,6 @@
package org.jboss.tools.cdi.seam.core;
import org.jboss.tools.common.log.BaseUIPlugin;
-import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
@@ -33,28 +32,9 @@
* The constructor
*/
public CDISeamCorePlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
plugin = this;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
/**
* Returns the shared instance
*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java 2012-01-24 23:00:07 UTC (rev 38125)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java 2012-01-24 23:04:10 UTC (rev 38126)
@@ -25,6 +25,7 @@
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.CDIImages;
import org.jboss.tools.cdi.seam.core.CDISeamCorePlugin;
@@ -159,7 +160,9 @@
if (project == null)
return null;
- if (!CDICorePlugin.getCDI(project, true).getExtensionManager().isCDIExtensionAvailable(CDISeamCorePlugin.CDI_INTERNATIONAL_RUNTIME_EXTENTION))
+ CDICoreNature n = CDICorePlugin.getCDI(project, true);
+
+ if (n == null || !n.getExtensionManager().isCDIExtensionAvailable(CDISeamCorePlugin.CDI_INTERNATIONAL_RUNTIME_EXTENTION))
return null;
IBundleModel bundleModel = BundleModelFactory.getBundleModel(context.getResource().getProject());
12 years, 5 months
JBoss Tools SVN: r38125 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui: contentassist and 1 other directory.
by jbosstools-commits＠lists.jboss.org
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;
}
12 years, 5 months