JBoss Tools SVN: r38144 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 19:14:54 -0500 (Tue, 24 Jan 2012)
New Revision: 38144
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/JsfTemplatePlugin.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
JsfTemplatePlugin is modified to follow the common pattern.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/JsfTemplatePlugin.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/JsfTemplatePlugin.java 2012-01-25 00:13:26 UTC (rev 38143)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/JsfTemplatePlugin.java 2012-01-25 00:14:54 UTC (rev 38144)
@@ -1,12 +1,6 @@
package org.jboss.tools.jsf.vpe.jsf;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
import org.jboss.tools.common.log.BaseUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
@@ -23,28 +17,9 @@
* The constructor
*/
public JsfTemplatePlugin() {
- }
-
- /*
- * (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: r38143 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/src/org/jboss/tools/jsf/vpe/jbpm.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 19:13:26 -0500 (Tue, 24 Jan 2012)
New Revision: 38143
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/src/org/jboss/tools/jsf/vpe/jbpm/JBPMTemplatePlugin.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
JBPMTemplatePlugin is modified to follow the common pattern.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/src/org/jboss/tools/jsf/vpe/jbpm/JBPMTemplatePlugin.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/src/org/jboss/tools/jsf/vpe/jbpm/JBPMTemplatePlugin.java 2012-01-25 00:11:56 UTC (rev 38142)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/src/org/jboss/tools/jsf/vpe/jbpm/JBPMTemplatePlugin.java 2012-01-25 00:13:26 UTC (rev 38143)
@@ -28,26 +28,9 @@
* The constructor
*/
public JBPMTemplatePlugin() {
- }
-
- /*
- * (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: r38142 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 19:11:56 -0500 (Tue, 24 Jan 2012)
New Revision: 38142
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/FaceletsPlugin.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
FaceletsPlugin is modified to follow the common pattern.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/FaceletsPlugin.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/FaceletsPlugin.java 2012-01-25 00:10:32 UTC (rev 38141)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/FaceletsPlugin.java 2012-01-25 00:11:56 UTC (rev 38142)
@@ -11,8 +11,6 @@
package org.jboss.tools.jsf.vpe.facelets;
import org.eclipse.ui.plugin.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
/**
* The main plugin class to be used in the desktop.
@@ -30,35 +28,10 @@
}
/**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
* Returns the shared instance.
*/
public static FaceletsPlugin getDefault() {
return plugin;
}
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path.
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin("org.jboss.tools.jsf.vpe.facelets", path); //$NON-NLS-1$
- }
}
12 years, 5 months
JBoss Tools SVN: r38141 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 19:10:32 -0500 (Tue, 24 Jan 2012)
New Revision: 38141
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/Activator.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
ajax4jsf.Activator is modified to follow the common pattern.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/Activator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/Activator.java 2012-01-25 00:05:18 UTC (rev 38140)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/Activator.java 2012-01-25 00:10:32 UTC (rev 38141)
@@ -17,7 +17,6 @@
import org.eclipse.core.runtime.Platform;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
@@ -38,21 +37,6 @@
}
/**
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * @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
*
* @return the shared instance
12 years, 5 months
JBoss Tools SVN: r38140 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 19:05:18 -0500 (Tue, 24 Jan 2012)
New Revision: 38140
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/RichfacesExtensionsPlugin.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
RichfacesExtensionsPlugin: obsolete methods are removed.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/RichfacesExtensionsPlugin.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/RichfacesExtensionsPlugin.java 2012-01-24 23:58:38 UTC (rev 38139)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/src/org/jboss/tools/jsf/text/ext/richfaces/RichfacesExtensionsPlugin.java 2012-01-25 00:05:18 UTC (rev 38140)
@@ -10,14 +10,7 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.richfaces;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
import org.eclipse.ui.plugin.*;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
/**
* The main plugin class to be used in the desktop.
@@ -26,74 +19,21 @@
//The shared instance.
private static RichfacesExtensionsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
public static final String PLUGIN_ID = "org.jboss.tools.jsf.text.ext.richfaces"; //$NON-NLS-1$
-
/**
* The constructor.
*/
public RichfacesExtensionsPlugin() {
plugin = this;
- try {
- resourceBundle= ResourceBundle.getBundle("org.jboss.tools.jsf.text.ext.richfaces.RichfacesExtensionsPlugin"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
}
/**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
* Returns the shared instance.
*/
public static RichfacesExtensionsPlugin getDefault() {
return plugin;
}
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path.
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin("org.jboss.tools.jsf.text.ext.richfaces", path); //$NON-NLS-1$
- }
-
- /**
- * 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= RichfacesExtensionsPlugin.getDefault().getResourceBundle();
- try {
- return bundle.getString(key);
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
}
12 years, 5 months
JBoss Tools SVN: r38139 - in trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets: src/org/jboss/tools/jsf/text/ext/facelets and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 18:58:38 -0500 (Tue, 24 Jan 2012)
New Revision: 38139
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/tools/jsf/text/ext/facelets/FaceletsExtensionsPlugin.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
FaceletsExtensionsPlugin is modified to follow the common pattern.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFEST.MF 2012-01-24 23:54:39 UTC (rev 38138)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFEST.MF 2012-01-24 23:58:38 UTC (rev 38139)
@@ -9,6 +9,7 @@
Require-Bundle:
org.eclipse.ui,org.eclipse.core.runtime,
org.eclipse.core.resources,org.eclipse.jface.text,
+ org.jboss.tools.common,
org.jboss.tools.common.text.ext,
org.jboss.tools.jst.text.ext,
org.jboss.tools.jsf.text.ext
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/tools/jsf/text/ext/facelets/FaceletsExtensionsPlugin.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/tools/jsf/text/ext/facelets/FaceletsExtensionsPlugin.java 2012-01-24 23:54:39 UTC (rev 38138)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/tools/jsf/text/ext/facelets/FaceletsExtensionsPlugin.java 2012-01-24 23:58:38 UTC (rev 38139)
@@ -10,56 +10,28 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.facelets;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.jboss.tools.common.log.BaseUIPlugin;
/**
* The main plugin class to be used in the desktop.
*/
-public class FaceletsExtensionsPlugin extends AbstractUIPlugin {
+public class FaceletsExtensionsPlugin extends BaseUIPlugin {
//The shared instance.
private static FaceletsExtensionsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
public static final String PLUGIN_ID = "org.jboss.tools.jsf.text.ext.facelets"; //$NON-NLS-1$
-
/**
* The constructor.
*/
public FaceletsExtensionsPlugin() {
plugin = this;
- try {
- resourceBundle= ResourceBundle.getBundle("org.jboss.tools.jsf.text.ext.facelets.FaceletsExtensionsPlugin"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
}
/**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
* Returns the shared instance.
*/
public static FaceletsExtensionsPlugin getDefault() {
@@ -77,31 +49,4 @@
return AbstractUIPlugin.imageDescriptorFromPlugin("org.jboss.tools.jsf.text.ext.facelets", path); //$NON-NLS-1$
}
- /**
- * 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= FaceletsExtensionsPlugin.getDefault().getResourceBundle();
- try {
- return bundle.getString(key);
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
}
12 years, 5 months
JBoss Tools SVN: r38138 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 18:54:39 -0500 (Tue, 24 Jan 2012)
New Revision: 38138
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFExtensionsPlugin.java
Log:
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFExtensionsPlugin.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFExtensionsPlugin.java 2012-01-24 23:53:53 UTC (rev 38137)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFExtensionsPlugin.java 2012-01-24 23:54:39 UTC (rev 38138)
@@ -10,13 +10,6 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-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.jboss.tools.common.log.BaseUIPlugin;
/**
12 years, 5 months
JBoss Tools SVN: r38137 - in trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext: hyperlink and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 18:53:53 -0500 (Tue, 24 Jan 2012)
New Revision: 38137
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFExtensionsPlugin.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPValidatorHyperlinkPartitioner.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
JSFExtensionsPlugin is modified to follow the common pattern.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFExtensionsPlugin.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFExtensionsPlugin.java 2012-01-24 23:49:36 UTC (rev 38136)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFExtensionsPlugin.java 2012-01-24 23:53:53 UTC (rev 38137)
@@ -17,17 +17,15 @@
import org.eclipse.core.resources.ResourcesPlugin;
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;
/**
* @author Jeremy
*
*/
-public class JSFExtensionsPlugin extends AbstractUIPlugin {
+public class JSFExtensionsPlugin extends BaseUIPlugin {
//The shared instance.
private static JSFExtensionsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
public static final String PLUGIN_ID = "org.jboss.tools.jsf.text.ext"; //$NON-NLS-1$
@@ -37,11 +35,6 @@
*/
public JSFExtensionsPlugin() {
plugin = this;
- try {
- resourceBundle= ResourceBundle.getBundle("org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
}
/**
@@ -51,45 +44,8 @@
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= JSFExtensionsPlugin.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) {
- JSFExtensionsPlugin.getDefault().getLog().log(new Status(Status.INFO, PLUGIN_ID, Status.OK, msg, null));
- }
-
- public static void log(IStatus status) {
- JSFExtensionsPlugin.getDefault().getLog().log(status);
- }
public static void log(String message, Exception exception) {
- JSFExtensionsPlugin.getDefault().getLog().log(new Status(Status.ERROR, JSFExtensionsPlugin.PLUGIN_ID, Status.OK, message, exception));
+ JSFExtensionsPlugin.getDefault().logError(message, exception);
}
- static public void log(Exception ex) {
- JSFExtensionsPlugin.getDefault().getLog().log(new Status(Status.ERROR, JSFExtensionsPlugin.PLUGIN_ID, Status.OK, JSFTextExtMessages.JSFExtensionsPlugin_NoMessage, ex));
- }
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPValidatorHyperlinkPartitioner.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPValidatorHyperlinkPartitioner.java 2012-01-24 23:49:36 UTC (rev 38136)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPValidatorHyperlinkPartitioner.java 2012-01-24 23:53:53 UTC (rev 38137)
@@ -108,7 +108,7 @@
return new Region(propStart,propLength);
} catch (BadLocationException x) {
- JSFExtensionsPlugin.log(x);
+ JSFExtensionsPlugin.getDefault().logError(x);
return null;
} finally {
smw.dispose();
12 years, 5 months
JBoss Tools SVN: r38136 - in trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf: model and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 18:49:36 -0500 (Tue, 24 Jan 2012)
New Revision: 38136
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
Removed obsolete methods.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java 2012-01-24 23:32:18 UTC (rev 38135)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java 2012-01-24 23:49:36 UTC (rev 38136)
@@ -8,8 +8,6 @@
import java.util.Properties;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
import org.jboss.tools.common.log.BaseUIPlugin;
import org.jboss.tools.common.log.IPluginLog;
import org.jboss.tools.common.model.XModel;
@@ -29,9 +27,11 @@
public static final String CA_JSF_EL_IMAGE_PATH = "images/ca/icons_JSF_EL.gif"; //$NON-NLS-1$
public static final String CA_JSF_MESSAGES_IMAGE_PATH = "images/ca/icons_Message_Bundles.gif"; //$NON-NLS-1$
+ private static JSFModelPlugin plugin = null;
+
public JSFModelPlugin() {
super();
- INSTANCE = this;
+ plugin = this;
}
protected void initializeDefaultPluginPreferences()
@@ -60,28 +60,10 @@
}
}
- 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 boolean isDebugEnabled() {
- return INSTANCE.isDebugging();
- }
-
public static JSFModelPlugin getDefault() {
- return INSTANCE;
+ return plugin;
}
- static JSFModelPlugin INSTANCE = null;
-
/**
* @return IPluginLog object
*/
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java 2012-01-24 23:32:18 UTC (rev 38135)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java 2012-01-24 23:49:36 UTC (rev 38136)
@@ -246,7 +246,7 @@
currentType = TypeInfoCollector.getSuperclass(currentType);
}
} catch (JavaModelException e) {
- JSFModelPlugin.log("An error occurred while retrieving methods for type '" + funcClass + "'", e);
+ JSFModelPlugin.getDefault().logError("An error occurred while retrieving methods for type '" + funcClass + "'", e);
}
return result;
12 years, 5 months
JBoss Tools SVN: r38135 - trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-24 18:32:18 -0500 (Tue, 24 Jan 2012)
New Revision: 38135
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/CDIXMLUiPlugin.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
CDIXMLUiPlugin is modified to follow the common pattern.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/CDIXMLUiPlugin.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/CDIXMLUiPlugin.java 2012-01-24 23:29:53 UTC (rev 38134)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/CDIXMLUiPlugin.java 2012-01-24 23:32:18 UTC (rev 38135)
@@ -10,49 +10,18 @@
******************************************************************************/
package org.jboss.tools.cdi.xml.ui;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
+import org.jboss.tools.common.log.BaseUIPlugin;
-public class CDIXMLUiPlugin extends AbstractUIPlugin {
+public class CDIXMLUiPlugin extends BaseUIPlugin {
public static String PLUGIN_ID = "org.jboss.tools.cdi.xml.ui"; //$NON-NLS-1$
- static CDIXMLUiPlugin INSTANCE = null;
+ static CDIXMLUiPlugin plugin = null;
public CDIXMLUiPlugin() {
- INSTANCE = this;
+ plugin = this;
}
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
public static CDIXMLUiPlugin getDefault() {
- return INSTANCE;
+ return plugin;
}
- public static boolean isDebugEnabled() {
- return INSTANCE.isDebugging();
- }
-
- 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(Throwable ex) {
- INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, CDIXMLUIMessages.CDI_XML_UI_PLUGIN_NO_MESSAGES, ex)); //$NON-NLS-1$
- }
-
- public static Shell getShell() {
- return INSTANCE.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
}
12 years, 5 months