Author: rob.stryker(a)jboss.com Date: 2009-04-27 05:19:15 -0400 (Mon, 27 Apr 2009) New Revision: 14934 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java Log: JBIDE-4242 - moving filesets out of the server object since they don't belong there Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF 2009-04-27 07:06:36 UTC (rev 14933) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF 2009-04-27 09:19:15 UTC (rev 14934) @@ -19,7 +19,8 @@ org.eclipse.ui.ide;bundle-version="3.4.0", org.jboss.ide.eclipse.as.ui;bundle-version="1.0.0", org.eclipse.core.filesystem;bundle-version="1.2.0", - org.eclipse.ui.navigator;bundle-version="3.3.100" + org.eclipse.ui.navigator;bundle-version="3.3.100", + org.jboss.tools.jmx.core;bundle-version="0.2.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.jboss.ide.eclipse.archives.webtools, Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java 2009-04-27 07:06:36 UTC (rev 14933) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java 2009-04-27 09:19:15 UTC (rev 14934) @@ -10,6 +10,10 @@ ******************************************************************************/ package org.jboss.ide.eclipse.archives.webtools.ui; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -23,10 +27,16 @@ import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.archives.core.asf.DirectoryScanner; import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathCategory; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; +import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; +import org.jboss.tools.jmx.core.IMemento; +import org.jboss.tools.jmx.core.util.XMLMemento; public class FilesetContentProvider implements ITreeContentProvider { private static final String FILESET_KEY = "org.jboss.ide.eclipse.as.ui.views.server.providers.FilesetViewProvider.PropertyKey"; //$NON-NLS-1$ + private static final String FILESET_FILE_NAME = "filesets.xml"; //$NON-NLS-1$ public static class PathWrapper { private IPath path; @@ -144,11 +154,20 @@ } private Fileset[] loadFilesets() { + if( getFile(server).exists()) { + return FilesetContentProvider.loadFilesets(server); + } else { + return loadFilesets_LEGACY(); + } + } + + @Deprecated + private Fileset[] loadFilesets_LEGACY() { Fileset[] filesets = new Fileset[0]; if (server != null) { ServerAttributeHelper helper = ServerAttributeHelper .createHelper(server); - List tmp = helper.getAttribute(FILESET_KEY, new ArrayList()); + List<String> tmp = (ArrayList<String>)helper.getAttribute(FILESET_KEY, new ArrayList<String>()); String[] asStrings = (String[]) tmp.toArray(new String[tmp .size()]); filesets = new Fileset[asStrings.length]; @@ -160,18 +179,53 @@ } public void saveFilesets() { - if (server != null) { - ArrayList<String> list = new ArrayList<String>(); - for (int i = 0; i < children.length; i++) { - list.add(children[i].toString()); - } - ServerAttributeHelper helper = ServerAttributeHelper - .createHelper(server); - helper.setAttribute(FILESET_KEY, list); - helper.save(); + FilesetContentProvider.saveFilesets(server, children); + } + } + + protected static Fileset[] loadFilesets(IServer server) { + Fileset[] filesets = null; + try { + File file = getFile(server); + XMLMemento memento = XMLMemento.createReadRoot(new FileInputStream(file)); + IMemento[] categoryMementos = memento.getChildren("fileset");//$NON-NLS-1$ + filesets = new Fileset[categoryMementos.length]; + String name, folder, includes, excludes; + for( int i = 0; i < categoryMementos.length; i++ ) { + name = categoryMementos[i].getString("name"); //$NON-NLS-1$ + folder = categoryMementos[i].getString("folder");//$NON-NLS-1$ + includes = categoryMementos[i].getString("includes");//$NON-NLS-1$ + excludes = categoryMementos[i].getString("excludes");//$NON-NLS-1$ + filesets[i] = new Fileset(name, folder, includes, excludes); } + } catch( IOException ioe) { + // TODO LOG } + return filesets == null ? new Fileset[] { } : filesets; } + + protected static void saveFilesets(IServer server, Fileset[] sets) { + if( server != null ) { + XMLMemento memento = XMLMemento.createWriteRoot("filesets"); //$NON-NLS-1$ + for( int i = 0; i < sets.length; i++ ) { + XMLMemento child = (XMLMemento)memento.createChild("fileset");//$NON-NLS-1$ + child.putString("name", sets[i].getName());//$NON-NLS-1$ + child.putString("folder", sets[i].getFolder());//$NON-NLS-1$ + child.putString("includes", sets[i].getIncludesPattern());//$NON-NLS-1$ + child.putString("excludes", sets[i].getExcludesPattern());//$NON-NLS-1$ + } + try { + memento.save(new FileOutputStream(getFile(server))); + } catch( IOException ioe) { + // TODO LOG + } + } + } + + protected static File getFile(IServer server) { + return JBossServerCorePlugin.getServerStateLocation(server) + .append(FILESET_FILE_NAME).toFile(); + } public Object[] getChildren(Object parentElement) { if (parentElement instanceof IServer) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2009-04-27 07:06:36 UTC (rev 14933) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2009-04-27 09:19:15 UTC (rev 14934) @@ -54,7 +54,6 @@ private static final String DELIMITER = ","; //$NON-NLS-1$ private static final String CATEGORY_LIST = "org.jboss.ide.eclipse.as.core.model.descriptor.Categories"; //$NON-NLS-1$ - private static final IPath STATE_LOCATION = JBossServerCorePlugin.getDefault().getStateLocation(); /* Singleton */ private static XPathModel instance; @@ -160,7 +159,7 @@ * Loading and saving is below */ protected File getFile(IServer server) { - return STATE_LOCATION.append(server.getId().replace(' ', '_')).append(IJBossToolingConstants.XPATH_FILE_NAME).toFile(); + return JBossServerCorePlugin.getServerStateLocation(server).append(IJBossToolingConstants.XPATH_FILE_NAME).toFile(); } public void save(IServer server) {