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;