Author: dgolovin Date: 2011-09-13 21:17:47 -0400 (Tue, 13 Sep 2011) New Revision: 34708 Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ClassLoaderUtil.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIXMLFormLayoutData.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MetaFormLayoutData.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/ReportProblemActionDelegate.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/TabbedPreferencesPage.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/util/ModelUtilities.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XMetaDataLoader.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelFactory.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/PreferenceModelUtilities.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/plugin/ModelPlugin.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutData.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/FaceletTaglibXMLFormLayoutData.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFormLayoutData.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/model/PaletteModel.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java Log: Code cleanup: ClassLoaderUtil.java deleted. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIXMLFormLayoutData.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIXMLFormLayoutData.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIXMLFormLayoutData.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -10,14 +10,15 @@ ******************************************************************************/ package org.jboss.tools.cdi.xml.ui.editor.form; -import java.util.*; -import org.jboss.tools.common.model.util.ClassLoaderUtil; -import org.jboss.tools.common.model.ui.forms.*; +import java.util.Collections; +import java.util.Map; +import org.jboss.tools.common.model.ui.forms.ArrayToMap; +import org.jboss.tools.common.model.ui.forms.IFormData; +import org.jboss.tools.common.model.ui.forms.IFormLayoutData; +import org.jboss.tools.common.model.ui.forms.ModelFormLayoutData; + public class CDIXMLFormLayoutData implements IFormLayoutData { - static { - ClassLoaderUtil.init(); - } public static String EMPTY_DESCRIPTION = ""; //$NON-NLS-1$ Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MetaFormLayoutData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MetaFormLayoutData.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MetaFormLayoutData.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -10,14 +10,15 @@ ******************************************************************************/ package org.jboss.tools.common.meta.ui.form; -import java.util.*; -import org.jboss.tools.common.model.util.ClassLoaderUtil; -import org.jboss.tools.common.model.ui.forms.*; +import java.util.Collections; +import java.util.Map; +import org.jboss.tools.common.model.ui.forms.ArrayToMap; +import org.jboss.tools.common.model.ui.forms.IFormData; +import org.jboss.tools.common.model.ui.forms.IFormLayoutData; +import org.jboss.tools.common.model.ui.forms.ModelFormLayoutData; + public class MetaFormLayoutData implements IFormLayoutData { - static { - ClassLoaderUtil.init(); - } private final static IFormData[] FORM_LAYOUT_DEFINITIONS = new IFormData[] { GroupFormLayoutData.GROUP_DEFINITION, Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XMetaDataLoader.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XMetaDataLoader.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XMetaDataLoader.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -11,16 +11,15 @@ package org.jboss.tools.common.meta.impl; import java.io.FileNotFoundException; -import java.io.IOException; import java.text.MessageFormat; -import java.util.*; -import org.w3c.dom.*; +import java.util.Vector; + import org.jboss.tools.common.meta.XMetaElement; -import org.jboss.tools.common.meta.XModelEntity; import org.jboss.tools.common.model.XModelObjectConstants; import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.util.*; +import org.jboss.tools.common.model.util.XMLUtil; import org.jboss.tools.common.xml.XMLUtilities; +import org.w3c.dom.Element; public class XMetaDataLoader implements XMetaDataConstants { @@ -46,7 +45,7 @@ String loader = element.getAttribute(LOADER); if(loader == null || loader.length() == 0) return null; try { - return (XMetaElementImpl)ClassLoaderUtil.getClassLoader().loadClass(loader).newInstance(); + return (XMetaElementImpl)ModelPlugin.getDefault().getClass().getClassLoader().loadClass(loader).newInstance(); } catch (InstantiationException e) { ModelPlugin.getPluginLog().logError("Error in getMetaElementInstance " + loader, e); //$NON-NLS-1$ } catch (IllegalAccessException e) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelFactory.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelFactory.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModelFactory.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -6,11 +6,11 @@ package org.jboss.tools.common.model; -import java.util.*; +import java.util.Properties; + import org.jboss.tools.common.meta.XModelMetaData; import org.jboss.tools.common.meta.impl.XModelMetaDataImpl; import org.jboss.tools.common.model.impl.XModelImpl; -import org.jboss.tools.common.model.util.*; /** * Factory class to create instances of XModel interface. See @@ -50,7 +50,6 @@ } private static final class DefaultModelHolder { - static final XModel DEFAULT_INSTANCE = defaultInstance = createInstance(ClassLoaderUtil - .getProperties()); + static final XModel DEFAULT_INSTANCE = defaultInstance = createInstance(System.getProperties()); } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/PreferenceModelUtilities.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/PreferenceModelUtilities.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/PreferenceModelUtilities.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -10,18 +10,20 @@ ******************************************************************************/ package org.jboss.tools.common.model.options; -import java.util.*; -import org.jboss.tools.common.model.*; +import java.util.Properties; + +import org.jboss.tools.common.model.ServiceDialog; +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelConstants; +import org.jboss.tools.common.model.XModelException; +import org.jboss.tools.common.model.XModelFactory; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.XModelObjectConstants; import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.util.ClassLoaderUtil; import org.jboss.tools.common.model.util.ModelFeatureFactory; public class PreferenceModelUtilities { static final String ENT_OPTION_ROOT = "OptionRoot"; //$NON-NLS-1$ - - static { - ClassLoaderUtil.init(); - } private static class PreferenceModelHolder { public static XModel preferenceModel; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/plugin/ModelPlugin.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/plugin/ModelPlugin.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/plugin/ModelPlugin.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -26,13 +26,11 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.content.IContentDescription; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IWindowListener; import org.eclipse.ui.IWorkbenchWindow; import org.jboss.tools.common.log.BaseUIPlugin; import org.jboss.tools.common.log.IPluginLog; import org.jboss.tools.common.model.XModelConstants; -import org.jboss.tools.common.model.util.ClassLoaderUtil; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.osgi.framework.BundleContext; @@ -79,11 +77,6 @@ public void start(BundleContext context) throws Exception { System.setProperty(XModelConstants.HOME, EclipseResourceUtil.getInstallPath(context.getBundle())); super.start(context); - Display.getDefault().asyncExec(new Runnable() { - public void run() { - ClassLoaderUtil.init(); - } - }); } protected void initializeDefaultPluginPreferences() { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -10,13 +10,27 @@ ******************************************************************************/ package org.jboss.tools.common.model.project; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; -import org.eclipse.core.resources.*; -import org.eclipse.core.runtime.*; -import org.jboss.tools.common.model.*; +import org.eclipse.core.resources.ICommand; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IProjectDescription; +import org.eclipse.core.resources.IProjectNature; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IResourceChangeEvent; +import org.eclipse.core.resources.IResourceChangeListener; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.PlatformObject; +import org.jboss.tools.common.model.ServiceDialog; +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelConstants; +import org.jboss.tools.common.model.XModelFactory; +import org.jboss.tools.common.model.XModelObjectConstants; import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.util.ClassLoaderUtil; import org.jboss.tools.common.model.util.ModelFeatureFactory; public abstract class ModelNature extends PlatformObject implements IProjectNature, IModelNature { @@ -81,7 +95,6 @@ } private void createProject() { - ClassLoaderUtil.init(); Properties p = new Properties(); p.putAll(System.getProperties()); Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ClassLoaderUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ClassLoaderUtil.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ClassLoaderUtil.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -1,71 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.model.util; - -import java.util.*; - -import org.eclipse.core.runtime.Platform; -import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.osgi.framework.Bundle; - -public class ClassLoaderUtil { - public static ClassLoader getClassLoader() { - return ClassLoaderUtil.class.getClassLoader(); - } - - public static Properties getProperties() { - return System.getProperties(); - } - - public static String[] getClasspath() { - return new String[0]; - } - - private static String[][] activation = { - {"org.jboss.tools.jst.web.ui", "org.jboss.tools.jst.web.ui.WebUiPlugin", "optional"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - {"org.jboss.tools.jst.web", "org.jboss.tools.jst.web.WebModelPlugin", "optional"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - {"org.jboss.tools.jsf.ui", "org.jboss.tools.jsf.ui.JsfUiPlugin", "optional"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - {"org.jboss.tools.struts.ui", "org.jboss.tools.struts.ui.StrutsUIPlugin", "optional"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - {"org.jboss.tools.common.verification.ui", "org.jboss.tools.common.verification.ui.XStudioVerificationPlugin", "optional"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - }; - - private static void activate(int from, int to) { - for (int i = from; i < activation.length && i < to; i++) { - Bundle b = Platform.getBundle(activation[i][0]); - if(b == null) { - if(activation[i].length >= 2 && "required".equals(activation[i][2])) { //$NON-NLS-1$ - ModelPlugin.getPluginLog().logInfo("ClassLoaderUtil:activate: Cannot find required plugin " + activation[i][0]); //$NON-NLS-1$ - } - } else if(b.getState() != Bundle.ACTIVE) { - String n = activation[i][1]; - try { - b.loadClass(n); - } catch (ClassNotFoundException e) { - ModelPlugin.getPluginLog().logError("ClassLoaderUtil:activate: Cannot find class " + n); //$NON-NLS-1$ - } - } - } - } - - static Object lock = new Object(); - static boolean activated = false; - - public static void init() { - if(activated) return; - synchronized(lock) { - if(activated) return; - activated = true; - activate(0, 1); - } - activate(1, activation.length); - } - -} Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/ReportProblemActionDelegate.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/ReportProblemActionDelegate.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/ReportProblemActionDelegate.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -12,15 +12,10 @@ import java.util.Properties; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; - -import org.jboss.tools.common.model.util.ClassLoaderUtil; -import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.reporting.ReportProblemWizard; public class ReportProblemActionDelegate implements IWorkbenchWindowActionDelegate { @@ -32,7 +27,6 @@ public void init(IWorkbenchWindow window) {} public void run(IAction action) { - ClassLoaderUtil.init(); ReportProblemWizard wizard = new ReportProblemWizard(); Properties p = new Properties(); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/StructuredListAdapter.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -15,19 +15,17 @@ import java.util.List; import java.util.StringTokenizer; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.Viewer; +import org.jboss.tools.common.meta.XAttribute; +import org.jboss.tools.common.meta.action.XAttributeData; import org.jboss.tools.common.model.ui.IStructuredChangeListener; import org.jboss.tools.common.model.ui.IValueChangeListener; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.StructuredChange; import org.jboss.tools.common.model.ui.StructuredChangedEvent; import org.jboss.tools.common.model.ui.attribute.IListContentProvider; -import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.Viewer; - -import org.jboss.tools.common.meta.XAttribute; -import org.jboss.tools.common.meta.action.XAttributeData; -import org.jboss.tools.common.model.util.ClassLoaderUtil; import org.jboss.tools.common.model.util.ModelFeatureFactory; public class StructuredListAdapter extends DefaultValueAdapter Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -19,7 +19,6 @@ import org.jboss.tools.common.CommonPlugin; import org.jboss.tools.common.model.loaders.EntityRecognizerContext; import org.jboss.tools.common.model.options.PreferenceModelUtilities; -import org.jboss.tools.common.model.util.ClassLoaderUtil; import org.jboss.tools.common.util.FileUtil; /** @@ -27,10 +26,6 @@ */ public class XMLContentDescriber extends org.eclipse.core.runtime.content.XMLContentDescriber implements ITextContentDescriber { - static { - ClassLoaderUtil.init(); - } - public int describe(InputStream contents, IContentDescription description) throws IOException { super.describe(contents, description); contents.reset(); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/TabbedPreferencesPage.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/TabbedPreferencesPage.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/TabbedPreferencesPage.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -12,7 +12,6 @@ import java.util.List; import java.util.Map; -import org.jboss.tools.common.model.ui.util.ModelUtilities; import org.eclipse.jface.preference.IPreferencePage; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; @@ -22,19 +21,16 @@ import org.eclipse.swt.widgets.TabItem; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; - import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.util.ClassLoaderUtil; +import org.jboss.tools.common.model.ui.util.ModelUtilities; /** * @author eskimo * */ public class TabbedPreferencesPage extends PreferencePage implements IWorkbenchPreferencePage { - static { - ClassLoaderUtil.init(); - } + Map<String,PreferencePage> map = new HashMap<String,PreferencePage>(); public TabbedPreferencesPage(String[] paths) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/util/ModelUtilities.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/util/ModelUtilities.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/util/ModelUtilities.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -12,14 +12,9 @@ import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.options.PreferenceModelUtilities; -import org.jboss.tools.common.model.util.ClassLoaderUtil; public class ModelUtilities { - static { - ClassLoaderUtil.init(); - } - public static XModel getPreferenceModel() { return PreferenceModelUtilities.getPreferenceModel(); } Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -10,12 +10,18 @@ ******************************************************************************/ package org.jboss.tools.esb.ui.editor.form; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; import org.jboss.tools.common.meta.XModelEntity; import org.jboss.tools.common.meta.impl.XModelMetaDataImpl; -import org.jboss.tools.common.model.util.ClassLoaderUtil; -import org.jboss.tools.common.model.ui.forms.*; +import org.jboss.tools.common.model.ui.forms.ArrayToMap; +import org.jboss.tools.common.model.ui.forms.FormData; +import org.jboss.tools.common.model.ui.forms.IFormData; +import org.jboss.tools.common.model.ui.forms.IFormLayoutData; +import org.jboss.tools.common.model.ui.forms.ModelFormLayoutData; import org.jboss.tools.esb.core.model.ESBConstants; import org.jboss.tools.esb.core.model.converters.ConverterConstants; @@ -23,9 +29,6 @@ * @author Viacheslav Kabanovich */ public class ESBXMLFormLayoutData implements IFormLayoutData, ESBConstants { - static { - ClassLoaderUtil.init(); - } public static String EMPTY_DESCRIPTION = ""; //$NON-NLS-1$ Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutData.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutData.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutData.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -23,12 +23,8 @@ import org.jboss.tools.common.model.ui.forms.IFormData; import org.jboss.tools.common.model.ui.forms.IFormLayoutData; import org.jboss.tools.common.model.ui.forms.ModelFormLayoutData; -import org.jboss.tools.common.model.util.ClassLoaderUtil; public class Hibernate3FormLayoutData implements IFormLayoutData { - static { - ClassLoaderUtil.init(); - } private final static IFormData[] FORM_LAYOUT_DEFINITIONS = new IFormData[] { 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 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -17,7 +17,6 @@ import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.util.ClassLoaderUtil; import org.jboss.tools.common.model.util.EclipseResourceUtil; /** @@ -42,7 +41,6 @@ Properties p = new Properties(); p.setProperty(XModelConstants.WORKSPACE, EclipseResourceUtil.getInstallPath(this)); p.setProperty("initialModel", "true"); //$NON-NLS-1$ //$NON-NLS-2$ - ClassLoaderUtil.init(); XModel initialModel = PreferenceModelUtilities.createPreferenceModel(p); if (initialModel != null) { Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/FaceletTaglibXMLFormLayoutData.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/FaceletTaglibXMLFormLayoutData.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/FaceletTaglibXMLFormLayoutData.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -10,21 +10,26 @@ ******************************************************************************/ package org.jboss.tools.jsf.ui.editor.form; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; import org.jboss.tools.common.meta.XModelEntity; import org.jboss.tools.common.meta.impl.XModelMetaDataImpl; -import org.jboss.tools.common.model.util.ClassLoaderUtil; -import org.jboss.tools.common.model.ui.forms.*; +import org.jboss.tools.common.model.ui.forms.ArrayToMap; +import org.jboss.tools.common.model.ui.forms.FormAttributeData; +import org.jboss.tools.common.model.ui.forms.FormData; +import org.jboss.tools.common.model.ui.forms.FormLayoutDataUtil; +import org.jboss.tools.common.model.ui.forms.IFormData; +import org.jboss.tools.common.model.ui.forms.IFormLayoutData; +import org.jboss.tools.common.model.ui.forms.ModelFormLayoutData; import org.jboss.tools.jsf.facelet.model.FaceletTaglibConstants; /** * @author Viacheslav Kabanovich */ public class FaceletTaglibXMLFormLayoutData implements IFormLayoutData, FaceletTaglibConstants { - static { - ClassLoaderUtil.init(); - } public static String EMPTY_DESCRIPTION = ""; //$NON-NLS-1$ Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -12,23 +12,25 @@ import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.TreeMap; + import org.jboss.tools.common.meta.action.impl.WizardDataValidator; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.files.handlers.*; +import org.jboss.tools.common.model.files.handlers.CreateFileSupport; import org.jboss.tools.common.model.options.PreferenceModelUtilities; -import org.jboss.tools.common.model.util.ClassLoaderUtil; import org.jboss.tools.jst.web.WebModelPlugin; import org.jboss.tools.jst.web.model.helpers.WebAppHelper; import org.jboss.tools.jst.web.project.WebProject; import org.jboss.tools.jst.web.tld.TaglibMapping; public class CreateJSPFileSupport extends CreateFileSupport { - static { - ClassLoaderUtil.init(); - } protected Map<String,File> templates = new TreeMap<String,File>(); TaglibSet taglibs; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFormLayoutData.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFormLayoutData.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/webapp/form/WebAppFormLayoutData.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -10,17 +10,20 @@ ******************************************************************************/ package org.jboss.tools.jst.web.ui.editors.webapp.form; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; import org.jboss.tools.common.meta.XModelEntity; import org.jboss.tools.common.meta.impl.XModelMetaDataImpl; -import org.jboss.tools.common.model.util.ClassLoaderUtil; -import org.jboss.tools.common.model.ui.forms.*; +import org.jboss.tools.common.model.ui.forms.ArrayToMap; +import org.jboss.tools.common.model.ui.forms.FormData; +import org.jboss.tools.common.model.ui.forms.IFormData; +import org.jboss.tools.common.model.ui.forms.IFormLayoutData; +import org.jboss.tools.common.model.ui.forms.ModelFormLayoutData; public class WebAppFormLayoutData implements IFormLayoutData { - static { - ClassLoaderUtil.init(); - } private final static IFormData[] FORM_LAYOUT_DEFINITIONS = new IFormData[] { WebAppFilterFormLayoutData.FILTER_FORM_DEFINITION, Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -10,14 +10,15 @@ ******************************************************************************/ package org.jboss.tools.seam.xml.ui.editor.form; -import java.util.*; -import org.jboss.tools.common.model.util.ClassLoaderUtil; -import org.jboss.tools.common.model.ui.forms.*; +import java.util.Collections; +import java.util.Map; +import org.jboss.tools.common.model.ui.forms.ArrayToMap; +import org.jboss.tools.common.model.ui.forms.IFormData; +import org.jboss.tools.common.model.ui.forms.IFormLayoutData; +import org.jboss.tools.common.model.ui.forms.ModelFormLayoutData; + public class SeamXMLFormLayoutData implements IFormLayoutData { - static { - ClassLoaderUtil.init(); - } public static String EMPTY_DESCRIPTION = ""; //$NON-NLS-1$ Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -15,7 +15,6 @@ import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.util.ClassLoaderUtil; import org.jboss.tools.common.model.util.EclipseResourceUtil; /** @@ -37,7 +36,6 @@ p.setProperty(XModelConstants.WORKSPACE, EclipseResourceUtil.getInstallPath(this)); p.setProperty("initialModel", "true"); - ClassLoaderUtil.init(); XModel initialModel = PreferenceModelUtilities.createPreferenceModel(p); if (initialModel != null) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -27,13 +27,11 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.jboss.tools.common.model.util.ClassLoaderUtil; import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; @@ -70,9 +68,6 @@ // FIX for JBIDE-1628 static { - ClassLoaderUtil.init(); - // wait for initialization - TestUtil.delay(); JspEditorPlugin .getDefault() .getPreferenceStore() Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/model/PaletteModel.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/model/PaletteModel.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/model/PaletteModel.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -10,28 +10,22 @@ ******************************************************************************/ package org.jboss.tools.vpe.ui.palette.model; -import java.util.List; import java.util.ArrayList; +import java.util.List; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.gef.palette.PaletteEntry; import org.eclipse.gef.palette.PaletteContainer; - +import org.eclipse.gef.palette.PaletteEntry; +import org.eclipse.swt.widgets.Shell; import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.event.XModelTreeListener; +import org.jboss.tools.common.model.ui.util.ModelUtilities; import org.jboss.tools.common.model.ui.views.palette.PaletteContents; import org.jboss.tools.common.model.ui.views.palette.editor.PaletteEditor; -import org.jboss.tools.common.model.ui.util.ModelUtilities; -import org.jboss.tools.common.model.util.ClassLoaderUtil; public class PaletteModel { - static { - ClassLoaderUtil.init(); - } - private static PaletteModel instance = null; private static Object monitor = new Object(); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2011-09-14 00:13:43 UTC (rev 34707) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2011-09-14 01:17:47 UTC (rev 34708) @@ -31,7 +31,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.jboss.tools.common.model.util.ClassLoaderUtil; import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; @@ -67,9 +66,6 @@ // FIX for JBIDE-1628 static { - ClassLoaderUtil.init(); - // wait for initialization - TestUtil.delay(3000); JspEditorPlugin .getDefault() .getPreferenceStore()