Author: scabanovich Date: 2007-08-02 07:23:23 -0400 (Thu, 02 Aug 2007) New Revision: 2847 Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelClassLoader.java Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/GifIcon.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java Log: Obsolete class XModelClassLoader removed Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java 2007-08-02 11:22:39 UTC (rev 2846) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java 2007-08-02 11:23:23 UTC (rev 2847) @@ -230,14 +230,6 @@ */ public void setOut(PrintWriter out); - /** - * Returns class loader that includes resurces loaded - * by the model. - * - * @return - */ - public ClassLoader getModelClassLoader(); - /** * Registers in model an object by unique id. * Manager is any object used to extend model Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java 2007-08-02 11:22:39 UTC (rev 2846) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java 2007-08-02 11:23:23 UTC (rev 2847) @@ -12,7 +12,6 @@ import org.jboss.tools.common.model.*; import org.jboss.tools.common.model.util.*; -import org.jboss.tools.common.model.impl.*; public class JarSystemImpl extends JarFolderImpl implements org.jboss.tools.common.model.filesystems.FileSystem { private static final long serialVersionUID = 7958999759019059243L; @@ -71,8 +70,6 @@ if(jar.isLoaded()) { XModelObject[] cs = getChildren(); for (int i = 0; i < cs.length; i++) removeChild_0(cs[i]); - XModelClassLoader l = (XModelClassLoader)getModel().getModelClassLoader(); - l.invalidate(); jar.invalidate(); } loaded = false; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java 2007-08-02 11:22:39 UTC (rev 2846) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/MountFileSystemHandler.java 2007-08-02 11:23:23 UTC (rev 2847) @@ -16,7 +16,6 @@ import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; import org.jboss.tools.common.model.*; import org.jboss.tools.common.model.util.*; -import org.jboss.tools.common.model.impl.XModelClassLoader; public class MountFileSystemHandler extends DefaultCreateHandler { @@ -118,8 +117,6 @@ static SpecialWizard w = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.common.model.project.ClassPathUpdateWizard"); public static void updateClassPath(XModelObject fs) { - XModelClassLoader cl = (XModelClassLoader)fs.getModel().getModelClassLoader(); - cl.invalidate(); if(fs.getModelEntity().getName().indexOf("ar") >= 0 && w != null) { Properties p = new Properties(); p.put("model", fs.getModel()); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/GifIcon.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/GifIcon.java 2007-08-02 11:22:39 UTC (rev 2846) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/GifIcon.java 2007-08-02 11:23:23 UTC (rev 2847) @@ -31,7 +31,8 @@ String p = XModelObjectLoaderUtil.getResourcePath(obj); if(p == null) return null; p = p.substring(1); - java.net.URL url = obj.getModel().getModelClassLoader().getResource(p); + if(true) return null; + java.net.URL url = null; //obj.getModel().getModelClassLoader().getResource(p); ImageIcon icon = new ImageIcon(url); return (icon.getIconWidth() > 20) ? null : icon; } catch (Exception e) { Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelClassLoader.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelClassLoader.java 2007-08-02 11:22:39 UTC (rev 2846) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelClassLoader.java 2007-08-02 11:23:23 UTC (rev 2847) @@ -1,114 +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.impl; - -import org.jboss.tools.common.model.filesystems.FileSystem; -import org.jboss.tools.common.model.filesystems.FileSystemsHelper; - -import java.io.*; -import java.util.*; -import java.net.*; -import org.jboss.tools.common.model.*; -import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.util.*; - -public class XModelClassLoader extends URLClassLoader { - private XModel model = null; - private HashSet<String> urls = new HashSet<String>(), tempurls = new HashSet<String>(); - private HashSet<String> classes = new HashSet<String>(); - private boolean valid = true; - - public XModelClassLoader(XModel model) { - super(new URL[0], ClassLoaderUtil.getClassLoader()); - this.model = model; - } - - protected Class findClass(final String name) throws ClassNotFoundException { - Class c = super.findClass(name); - if(c != null) classes.add(name); - return c; - } - - public void validate() { - XModelObject fs = FileSystemsHelper.getFileSystems(model); - if(fs == null) return; - XModelObject[] os = fs.getChildren(); - for (int i = 0; i < os.length; i++) { - String loc = os[i].get("LOCATION"); - if(loc == null || loc.length() == 0) continue; - loc = XModelObjectUtil.expand(loc, model, null); - File f = new File(loc); - try { - loc = f.getCanonicalPath(); - } catch (Exception e) { - //ignore - } - if(loc == null) continue; - String l = loc.toLowerCase(); - if(urls.contains(l)) continue; - urls.add(l); - try { - FileSystem fsi = (FileSystem)os[i]; - String tl = XModelObjectUtil.expand(fsi.getTempLocation(), model, null); - f = new File(tl).getCanonicalFile(); - addURL(f.toURL()); - tempurls.add(f.getAbsolutePath()); - } catch (Exception e) { - ModelPlugin.getPluginLog().logError(e); - tempurls.add(l); - } - } - } - - public boolean isUsed() { - return urls.size() > 0; - } - - public String getClassPath() { - StringBuffer sb = new StringBuffer(); - String[] s = new String[0]; - ///ClassLoaderUtil.getClassLoader().getClasspath(); - for(int i = 0; i < s.length; i++) sb.append(s[i]).append(File.pathSeparator); - URL[] us = getURLs(); - for (int i = 0; i < us.length; i++) { - String p = us[i].getPath(); - if((p.charAt(0)=='/' && p.charAt(2)==':') || - (p.charAt(0)=='\\' && p.charAt(2)==':')) { - p = p.substring(1); - } - sb.append(p).append(File.pathSeparator); - } - return sb.toString(); - } - - public String getSourcePath() { - Iterator i = tempurls.iterator(); - StringBuffer sb = new StringBuffer(); - while(i.hasNext()) { - sb.append(i.next()).append(File.pathSeparator); - } - return sb.toString(); - } - - public boolean isLoaded(String name) { - return classes.contains(name); - } - - public void invalidate() { - valid = false; - } - - public boolean isValid() { - return valid; - } - -} - Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2007-08-02 11:22:39 UTC (rev 2846) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2007-08-02 11:23:23 UTC (rev 2847) @@ -66,7 +66,6 @@ private FileSystemPeer fileregistry = new FileSystemPeer(); private PrintWriter out = new PrintWriter(System.out, true); private HashMap<String,XModelObject> extraroots = new HashMap<String,XModelObject>(2); - private XModelClassLoader classloader = new XModelClassLoader(this); private String rootEntity = "Root"; public XModelImpl(Properties properties, XModelMetaData metadata) { @@ -127,14 +126,6 @@ return fileregistry; } - public ClassLoader getModelClassLoader() { - if(!classloader.isValid()) { - classloader = new XModelClassLoader(this); - classloader.validate(); - } - return classloader; - } - public XModelObject getRoot() { if(root == null) createRoot(); return root; @@ -376,8 +367,6 @@ treeListenersArray = treeListeners.toArray(new XModelTreeListener[0]); undoer.setModel(this); undoer.reset(); - if(classloader.isUsed()) classloader = new XModelClassLoader(this); - classloader.validate(); fireStructureChanged(getRoot(), 3, null); ///Project Watcher