diff --git a/trunk/SwingSet3/.gitignore b/trunk/SwingSet3/.gitignore new file mode 100644 index 0000000..8b8c81d --- /dev/null +++ b/trunk/SwingSet3/.gitignore @@ -0,0 +1,2 @@ +target/ +dependency-reduced-pom.xml diff --git a/trunk/SwingSet3/pom.xml b/trunk/SwingSet3/pom.xml new file mode 100644 index 0000000..8ba398b --- /dev/null +++ b/trunk/SwingSet3/pom.xml @@ -0,0 +1,136 @@ + + + 4.0.0 + com.sun + swingset + 3.00.00-SNAPSHOT + + SwingSet 3 + + https://github.com/cmarchand/swingset3 + + + UTF-8 + 11 + + + + + + org.junit + junit-bom + 5.11.0 + pom + import + + + + + + + org.jdesktop + appframework + 1.0.3 + + + com.kenai.nbpwr + org-jdesktop-animation-timing + 1.0-201002281504 + jar + + + org.swinglabs.swingx + swingx-core + 1.6.5-1 + + + org.swinglabs.swingx + swingx-painters + 1.6.5-1 + + + org.swinglabs.swingx + swingx-graphics + 1.6.5-1 + + + + javax.jnlp + jnlp + 1.2 + + + org.junit.jupiter + junit-jupiter-api + test + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.6.0 + + + org.apache.maven.plugins + maven-jar-plugin + 3.4.2 + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + + + + org.apache.maven.plugins + maven-source-plugin + + + jar + + true + + + + + + org.apache.maven.plugins + maven-shade-plugin + + + package + shade + + ${project.groupId}:${project.artifactId}:jar:sources:${project.version} + + + com.sun.swingset3.SwingSet3 + + + + + + + + + + + default + FreeHep + + true + + https://java.freehep.org/maven2 + + + diff --git a/trunk/SwingSet3/src/com/sun/swingset3/AboutBox.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/AboutBox.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/AboutBox.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/AboutBox.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/Demo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/Demo.java similarity index 93% rename from trunk/SwingSet3/src/com/sun/swingset3/Demo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/Demo.java index 6c269b7..55b2f52 100644 --- a/trunk/SwingSet3/src/com/sun/swingset3/Demo.java +++ b/trunk/SwingSet3/src/main/java/com/sun/swingset3/Demo.java @@ -38,9 +38,12 @@ import java.io.IOException; import java.lang.reflect.Method; import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.util.*; import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.Icon; import javax.swing.ImageIcon; @@ -50,8 +53,10 @@ * @author Amy Fowler */ public class Demo { - - public enum State { UNINITIALIZED, INITIALIZING, INITIALIZED, RUNNING, STOPPED, FAILED } + + private String USER_DIR = System.getProperty("user.dir"); + + public enum State { UNINITIALIZED, INITIALIZING, INITIALIZED, RUNNING, STOPPED, FAILED } private static final String IMAGE_EXTENSIONS[] = {".gif", ".png", ".jpg"}; @@ -203,9 +208,18 @@ public URL[] getSourceFiles() { if (!(sourceFilePaths.length == 1 && sourceFilePaths[0].length() == 0)) { for (String path : sourceFilePaths) { try { - URL url = new URL("file://" + System.getProperty("user.dir") + "/src/" + path); + // sources are in jar + URL url = getClass().getClassLoader().getResource(path); + if(url==null) { + // but if ran from IDE, go to sources to load them + url = new URI("file://" + USER_DIR + "/src/main/java/" + path).toURL(); + if(url==null) { + // try from resources + url = new URI("file://" + USER_DIR + "/src/main/resources/" + path).toURL(); + } + } pathURLs.add(url); - } catch (MalformedURLException e) { + } catch (Exception e) { SwingSet3.logger.log(Level.WARNING, "unable to load source file '" + path + "'"); } @@ -246,7 +260,7 @@ void setDemoComponent(Component component) { public Component createDemoComponent() { Component component = null; try { - component = (Component)demoClass.newInstance(); + component = (Component)demoClass.getConstructor().newInstance(); setDemoComponent(component); } catch (Exception e) { System.err.println(e); diff --git a/trunk/SwingSet3/src/com/sun/swingset3/DemoPanel.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/DemoPanel.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/DemoPanel.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/DemoPanel.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/DemoProperties.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/DemoProperties.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/DemoProperties.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/DemoProperties.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/DemoSelectorPanel.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/DemoSelectorPanel.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/DemoSelectorPanel.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/DemoSelectorPanel.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/IntroPanel.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/IntroPanel.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/IntroPanel.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/IntroPanel.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/SwingSet3.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/SwingSet3.java similarity index 98% rename from trunk/SwingSet3/src/com/sun/swingset3/SwingSet3.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/SwingSet3.java index 4f3841d..6787fdb 100644 --- a/trunk/SwingSet3/src/com/sun/swingset3/SwingSet3.java +++ b/trunk/SwingSet3/src/main/java/com/sun/swingset3/SwingSet3.java @@ -52,11 +52,8 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.*; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.ServiceLoader; +import java.net.URL; +import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; @@ -89,6 +86,8 @@ import com.sun.swingset3.utilities.RoundedPanel; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; +import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * @@ -122,7 +121,7 @@ public class SwingSet3 extends SingleFrameApplication { private static final Border EMPTY_BORDER = new EmptyBorder(0, 0, 0, 0); private static final Border PANEL_BORDER = new EmptyBorder(10, 10, 10, 10); - private static final String DEMO_LIST_FILE = "/META-INF/demolist"; + private static final String DEMO_LIST_FILE = "META-INF/demolist"; static { // Property must be set *early* due to Apple Bug#3909714 @@ -236,7 +235,7 @@ protected void initialize(String args[]) { if (demoList.isEmpty() || augment) { // Load default Demos try { - demoList.addAll(readDemoClassNames(new InputStreamReader(getClass().getResourceAsStream(DEMO_LIST_FILE)))); + demoList.addAll(readDemoClassNames(new InputStreamReader(getClass().getClassLoader().getResourceAsStream(DEMO_LIST_FILE)))); } catch (IOException ex) { exception = ex; logger.log(Level.WARNING, "unable to read resource: " + DEMO_LIST_FILE, ex); @@ -272,8 +271,8 @@ protected Demo createDemo(String demoClassName) { try { demoClass = Class.forName(demoClassName); } catch (ClassNotFoundException cnfe) { - logger.log(Level.WARNING, "demo class not found:"+ demoClassName); - } + logger.log(Level.WARNING, "demo class not found: "+ demoClassName); + } if (demoClass != null) { // Wrap Demo demo = new Demo(demoClass); @@ -281,8 +280,8 @@ protected Demo createDemo(String demoClassName) { } return demo; } - - protected PropertyChangeListener getDemoPropertyChangeListener() { + + protected PropertyChangeListener getDemoPropertyChangeListener() { if (demoPropertyChangeListener == null) { demoPropertyChangeListener = new DemoPropertyChangeListener(); } diff --git a/trunk/SwingSet3/src/com/sun/swingset3/codeview/CodeStyler.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/CodeStyler.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/codeview/CodeStyler.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/CodeStyler.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/codeview/CodeViewer.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/CodeViewer.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/codeview/CodeViewer.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/CodeViewer.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/codeview/Snippet.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/Snippet.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/codeview/Snippet.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/Snippet.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/codeview/SnippetHighlighter.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/SnippetHighlighter.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/codeview/SnippetHighlighter.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/SnippetHighlighter.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/codeview/SnippetMap.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/SnippetMap.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/codeview/SnippetMap.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/SnippetMap.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/codeview/SnippetNavigator.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/SnippetNavigator.java similarity index 99% rename from trunk/SwingSet3/src/com/sun/swingset3/codeview/SnippetNavigator.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/SnippetNavigator.java index 8ed52cb..584cb7d 100644 --- a/trunk/SwingSet3/src/com/sun/swingset3/codeview/SnippetNavigator.java +++ b/trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/SnippetNavigator.java @@ -32,6 +32,8 @@ package com.sun.swingset3.codeview; import com.sun.swingset3.utilities.ArrowIcon; +import org.jdesktop.swingx.util.GraphicsUtilities; + import java.awt.Color; import java.awt.Component; import java.awt.Dimension; @@ -51,7 +53,6 @@ import javax.swing.JPanel; import javax.swing.UIManager; import javax.swing.border.Border; -import org.jdesktop.swingx.graphics.GraphicsUtilities; /** * diff --git a/trunk/SwingSet3/src/com/sun/swingset3/codeview/SnippetParser.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/SnippetParser.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/codeview/SnippetParser.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/codeview/SnippetParser.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/DemoUtilities.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/DemoUtilities.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/DemoUtilities.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/DemoUtilities.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/JGridPanel.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/JGridPanel.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/JGridPanel.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/JGridPanel.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/JHyperlink.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/JHyperlink.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/JHyperlink.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/JHyperlink.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/ResourceManager.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/ResourceManager.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/ResourceManager.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/ResourceManager.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/Stacker.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/Stacker.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/Stacker.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/Stacker.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/button/ButtonDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/button/ButtonDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/button/ButtonDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/button/ButtonDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/colorchooser/BezierAnimationPanel.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/colorchooser/BezierAnimationPanel.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/colorchooser/BezierAnimationPanel.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/colorchooser/BezierAnimationPanel.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/colorchooser/ColorChooserDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/colorchooser/ColorChooserDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/colorchooser/ColorChooserDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/colorchooser/ColorChooserDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/ComboBoxDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/combobox/ComboBoxDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/ComboBoxDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/combobox/ComboBoxDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/dialog/DialogDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/dialog/DialogDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/dialog/DialogDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/dialog/DialogDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/EditorPaneDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/EditorPaneDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/EditorPaneDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/EditorPaneDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/COPYRIGHT b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/COPYRIGHT similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/COPYRIGHT rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/COPYRIGHT diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/ant.jpg b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/ant.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/ant.jpg rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/ant.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/book.jpg b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/book.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/book.jpg rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/book.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/bug.jpg b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/bug.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/bug.jpg rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/bug.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/bug2.jpg b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/bug2.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/bug2.jpg rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/bug2.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/crest.jpg b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/crest.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/crest.jpg rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/crest.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/king.jpg b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/king.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/king.jpg rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/king.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/micro.jpg b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/micro.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/micro.jpg rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/micro.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/seaweed.jpg b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/seaweed.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/seaweed.jpg rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/Octavo/seaweed.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/ant.html b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/ant.html similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/ant.html rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/ant.html diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/bug.html b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/bug.html similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/bug.html rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/bug.html diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/back.jpg b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/editorpane/back.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/back.jpg rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/editorpane/back.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/forward.jpg b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/editorpane/forward.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/forward.jpg rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/editorpane/forward.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/header.jpg b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/editorpane/header.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/header.jpg rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/editorpane/header.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/index.html b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/index.html similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/index.html rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/index.html diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/king.html b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/king.html similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/king.html rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/king.html diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/preface.html b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/preface.html similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/preface.html rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/preface.html diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/seaweed.html b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/seaweed.html similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/seaweed.html rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/seaweed.html diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/title.html b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/title.html similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/title.html rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/editorpane/book/title.html diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/FileChooserDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/filechooser/FileChooserDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/FileChooserDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/filechooser/FileChooserDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/frame/BusyGlass.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/frame/BusyGlass.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/frame/BusyGlass.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/frame/BusyGlass.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/frame/FrameDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/frame/FrameDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/frame/FrameDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/frame/FrameDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/gridbaglayout/Calculator.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/gridbaglayout/Calculator.java similarity index 98% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/gridbaglayout/Calculator.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/gridbaglayout/Calculator.java index c830306..457a342 100644 --- a/trunk/SwingSet3/src/com/sun/swingset3/demos/gridbaglayout/Calculator.java +++ b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/gridbaglayout/Calculator.java @@ -348,7 +348,7 @@ private void doProcessOperator(Operator operator) { private static Double stringToValue(String value) { try { - return new Double(value.replace(DECIMAL_SEPARATOR, '.')); + return Double.parseDouble(value.replace(DECIMAL_SEPARATOR, '.')); } catch (NumberFormatException e) { // Continue convertion } @@ -356,7 +356,7 @@ private static Double stringToValue(String value) { if (value.endsWith(String.valueOf(DECIMAL_SEPARATOR))) { try { // Try convert uncompleted value - return new Double(value.substring(0, value.length() - 1)); + return Double.parseDouble(value.substring(0, value.length() - 1)); } catch (NumberFormatException e) { // Continue convertion } diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/gridbaglayout/GridBagLayoutDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/gridbaglayout/GridBagLayoutDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/gridbaglayout/GridBagLayoutDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/gridbaglayout/GridBagLayoutDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/InternalFrameDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/internalframe/InternalFrameDemo.java similarity index 99% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/InternalFrameDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/internalframe/InternalFrameDemo.java index e2194cf..6e26f11 100644 --- a/trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/InternalFrameDemo.java +++ b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/internalframe/InternalFrameDemo.java @@ -105,8 +105,8 @@ public class InternalFrameDemo extends JPanel { private final ImageIcon smIcon3; private final ImageIcon smIcon4; - private final Integer DEMO_FRAME_LAYER = new Integer(2); - private final Integer PALETTE_LAYER = new Integer(3); + private final Integer DEMO_FRAME_LAYER = 2; + private final Integer PALETTE_LAYER = 3; private JCheckBox windowResizable = null; private JCheckBox windowClosable = null; diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/list/ListDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/list/ListDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/list/ListDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/list/ListDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/list/Permuter.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/list/Permuter.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/list/Permuter.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/list/Permuter.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/optionpane/OptionPaneDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/optionpane/OptionPaneDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/optionpane/OptionPaneDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/optionpane/OptionPaneDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/progressbar/ProgressBarDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/progressbar/ProgressBarDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/progressbar/ProgressBarDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/progressbar/ProgressBarDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/ScrollPaneDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/scrollpane/ScrollPaneDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/ScrollPaneDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/scrollpane/ScrollPaneDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/slider/SliderDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/slider/SliderDemo.java similarity index 99% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/slider/SliderDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/slider/SliderDemo.java index c6f6269..f2faaba 100644 --- a/trunk/SwingSet3/src/com/sun/swingset3/demos/slider/SliderDemo.java +++ b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/slider/SliderDemo.java @@ -180,7 +180,7 @@ private void createSliderDemo() { s.setPaintLabels(true); s.setSnapToTicks(true); - s.getLabelTable().put(new Integer(11), new JLabel(Integer.toString(11), JLabel.CENTER)); + s.getLabelTable().put(11, new JLabel("11", JLabel.CENTER)); s.setLabelTable(s.getLabelTable()); s.getAccessibleContext().setAccessibleName(resourceManager.getString("SliderDemo.minorticks")); diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/JMandelbrot.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/spinner/JMandelbrot.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/JMandelbrot.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/spinner/JMandelbrot.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/JPaletteShower.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/spinner/JPaletteShower.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/JPaletteShower.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/spinner/JPaletteShower.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/JSpinnerPanel.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/spinner/JSpinnerPanel.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/JSpinnerPanel.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/spinner/JSpinnerPanel.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/MandelbrotControl.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/spinner/MandelbrotControl.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/MandelbrotControl.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/spinner/MandelbrotControl.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/Palette.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/spinner/Palette.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/Palette.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/spinner/Palette.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/PaletteChooser.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/spinner/PaletteChooser.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/PaletteChooser.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/spinner/PaletteChooser.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/SpinnerDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/spinner/SpinnerDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/SpinnerDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/spinner/SpinnerDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/splitpane/SplitPaneDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/splitpane/SplitPaneDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/splitpane/SplitPaneDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/splitpane/SplitPaneDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/TabbedPaneDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/tabbedpane/TabbedPaneDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/TabbedPaneDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/tabbedpane/TabbedPaneDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/HyperlinkCellRenderer.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/HyperlinkCellRenderer.java similarity index 99% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/table/HyperlinkCellRenderer.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/HyperlinkCellRenderer.java index 21f5234..0caf658 100644 --- a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/HyperlinkCellRenderer.java +++ b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/HyperlinkCellRenderer.java @@ -279,7 +279,7 @@ public void mouseMoved(MouseEvent event) { public void mouseClicked(MouseEvent event) { if (checkIfPointInsideHyperlink(event.getPoint())) { - ActionEvent actionEvent = new ActionEvent(new Integer(hitRowIndex), + ActionEvent actionEvent = new ActionEvent(hitRowIndex, ActionEvent.ACTION_PERFORMED, "hyperlink"); diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/IMDBLink.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/IMDBLink.java similarity index 91% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/table/IMDBLink.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/IMDBLink.java index 7174dd3..297fc48 100644 --- a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/IMDBLink.java +++ b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/IMDBLink.java @@ -34,9 +34,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLEncoder; +import java.net.*; import java.util.ArrayList; /** @@ -57,7 +55,7 @@ private IMDBLink() { * @param year the year the movie was nominated for the oscar * @return String containing URI for movie's IMDB entry or null if URI could not be found */ - public static String getMovieURIString(String movieTitle, int year) throws IOException { + public static String getMovieURIString(String movieTitle, int year) throws IOException, URISyntaxException { ArrayList matches = new ArrayList(); URL url; BufferedReader reader; @@ -67,8 +65,8 @@ public static String getMovieURIString(String movieTitle, int year) throws IOExc // Thank you, yahoo, for granting our search request :-) try { String urlKey = URLEncoder.encode(movieTitle, "UTF-8"); - url = new URL("http://search.yahoo.com/search?ei=utf-8&fr=sfp&p=imdb+" + - urlKey + "&iscqry="); + url = new URI("http://search.yahoo.com/search?ei=utf-8&fr=sfp&p=imdb+" + + urlKey + "&iscqry=").toURL(); } catch (Exception ex) { System.err.println(ex); @@ -84,7 +82,7 @@ public static String getMovieURIString(String movieTitle, int year) throws IOExc // Parse response a find each imdb/titleString result String line; String imdbString = ".imdb.com"; - String titleStrings[] = {"/title", "/Title"}; + String[] titleStrings = {"/title", "/Title"}; while ((line = reader.readLine()) != null) { for (String titleString : titleStrings) { @@ -121,10 +119,10 @@ public static String getMovieURIString(String movieTitle, int year) throws IOExc } - private static boolean verifyYear(String imdbURL, int movieYear) throws IOException { + private static boolean verifyYear(String imdbURL, int movieYear) throws IOException, URISyntaxException { boolean yearMatches = false; - URLConnection conn = new URL(imdbURL).openConnection(); + URLConnection conn = new URI(imdbURL).toURL().openConnection(); conn.connect(); // Get the response diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/Link.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/Link.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/table/Link.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/Link.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/OscarCandidate.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/OscarCandidate.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/table/OscarCandidate.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/OscarCandidate.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/OscarCellRenderers.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/OscarCellRenderers.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/table/OscarCellRenderers.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/OscarCellRenderers.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/OscarDataParser.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/OscarDataParser.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/table/OscarDataParser.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/OscarDataParser.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/OscarTableModel.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/OscarTableModel.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/table/OscarTableModel.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/OscarTableModel.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/TableDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/TableDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/table/TableDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/table/TableDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/textfield/JHistoryTextField.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/textfield/JHistoryTextField.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/textfield/JHistoryTextField.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/textfield/JHistoryTextField.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/textfield/TextFieldDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/textfield/TextFieldDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/textfield/TextFieldDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/textfield/TextFieldDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/DirectionPanel.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/togglebutton/DirectionPanel.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/DirectionPanel.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/togglebutton/DirectionPanel.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/LayoutControlPanel.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/togglebutton/LayoutControlPanel.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/LayoutControlPanel.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/togglebutton/LayoutControlPanel.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/ToggleButtonDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/togglebutton/ToggleButtonDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/ToggleButtonDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/togglebutton/ToggleButtonDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tooltip/ToolTipDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/tooltip/ToolTipDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tooltip/ToolTipDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/tooltip/ToolTipDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tree/TreeDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/tree/TreeDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tree/TreeDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/tree/TreeDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/window/WindowDemo.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/window/WindowDemo.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/window/WindowDemo.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/demos/window/WindowDemo.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/utilities/AnimatingSplitPane.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/AnimatingSplitPane.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/utilities/AnimatingSplitPane.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/AnimatingSplitPane.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/utilities/ArrowIcon.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/ArrowIcon.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/utilities/ArrowIcon.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/ArrowIcon.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/utilities/CollapsiblePanel.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/CollapsiblePanel.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/utilities/CollapsiblePanel.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/CollapsiblePanel.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/utilities/DefaultsDisplay.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/DefaultsDisplay.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/utilities/DefaultsDisplay.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/DefaultsDisplay.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/utilities/GradientPanel.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/GradientPanel.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/utilities/GradientPanel.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/GradientPanel.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/utilities/HTMLPanel.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/HTMLPanel.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/utilities/HTMLPanel.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/HTMLPanel.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/utilities/RoundedBorder.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/RoundedBorder.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/utilities/RoundedBorder.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/RoundedBorder.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/utilities/RoundedPanel.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/RoundedPanel.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/utilities/RoundedPanel.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/RoundedPanel.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/utilities/RoundedTitleBorder.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/RoundedTitleBorder.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/utilities/RoundedTitleBorder.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/RoundedTitleBorder.java diff --git a/trunk/SwingSet3/src/com/sun/swingset3/utilities/Utilities.java b/trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/Utilities.java similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/utilities/Utilities.java rename to trunk/SwingSet3/src/main/java/com/sun/swingset3/utilities/Utilities.java diff --git a/trunk/SwingSet3/src/org/jdesktop/swingx/JXPanel.java b/trunk/SwingSet3/src/main/java/org/jdesktop/swingx/JXPanel.java similarity index 99% rename from trunk/SwingSet3/src/org/jdesktop/swingx/JXPanel.java rename to trunk/SwingSet3/src/main/java/org/jdesktop/swingx/JXPanel.java index 19cd51a..7559b9c 100644 --- a/trunk/SwingSet3/src/org/jdesktop/swingx/JXPanel.java +++ b/trunk/SwingSet3/src/main/java/org/jdesktop/swingx/JXPanel.java @@ -35,7 +35,7 @@ import javax.swing.Scrollable; import org.jdesktop.swingx.RepaintManagerX; import org.jdesktop.swingx.TranslucentRepaintManager; -import org.jdesktop.swingx.graphics.GraphicsUtilities; +import org.jdesktop.swingx.util.GraphicsUtilities; /** * A simple JPanel extension that adds translucency support. @@ -124,7 +124,7 @@ public void setAlpha(float alpha) { //win, no matter the approach. RepaintManager manager = RepaintManager.currentManager(this); if (!manager.getClass().isAnnotationPresent(TranslucentRepaintManager.class)) { - RepaintManager.setCurrentManager(new RepaintManagerX()); + RepaintManager.setCurrentManager(new RepaintManagerX(manager)); } } else if (alpha == 1) { //restore the oldOpaque if it was true (since opaque is false now) diff --git a/trunk/SwingSet3/src/META-INF/demolist b/trunk/SwingSet3/src/main/resources/META-INF/demolist similarity index 100% rename from trunk/SwingSet3/src/META-INF/demolist rename to trunk/SwingSet3/src/main/resources/META-INF/demolist diff --git a/trunk/SwingSet3/src/META-INF/services/javax.swing.LookAndFeel b/trunk/SwingSet3/src/main/resources/META-INF/services/javax.swing.LookAndFeel similarity index 100% rename from trunk/SwingSet3/src/META-INF/services/javax.swing.LookAndFeel rename to trunk/SwingSet3/src/main/resources/META-INF/services/javax.swing.LookAndFeel diff --git a/trunk/SwingSet3/src/com/sun/swingset3/codeview/resources/CodeViewer.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/codeview/resources/CodeViewer.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/codeview/resources/CodeViewer.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/codeview/resources/CodeViewer.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/codeview/resources/images/snippetglyph.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/codeview/resources/images/snippetglyph.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/codeview/resources/images/snippetglyph.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/codeview/resources/images/snippetglyph.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/codeview/resources/images/snippetglyph.psd b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/codeview/resources/images/snippetglyph.psd similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/codeview/resources/images/snippetglyph.psd rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/codeview/resources/images/snippetglyph.psd diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/ButtonDemo.html similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/ButtonDemo.html diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/ButtonDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/ButtonDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/ButtonDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/ButtonDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/blogs.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/blogs.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/blogs.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/blogs.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/document-print.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/document-print.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/document-print.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/document-print.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_day.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/earth_day.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_day.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/earth_day.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_night.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/earth_night.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_night.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/earth_night.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/edit-find.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/edit-find.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/edit-find.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/edit-find.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/redbutton.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/redbutton.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_dark.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/redbutton_dark.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_dark.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/redbutton_dark.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_glow.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/redbutton_glow.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_glow.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/button/resources/images/redbutton_glow.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/colorchooser/resources/ColorChooserDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/colorchooser/resources/ColorChooserDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/colorchooser/resources/ColorChooserDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/colorchooser/resources/ColorChooserDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/colorchooser/resources/images/ColorChooserDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/colorchooser/resources/images/ColorChooserDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/colorchooser/resources/images/ColorChooserDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/colorchooser/resources/images/ColorChooserDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/ComboBoxDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/ComboBoxDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/ComboBoxDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/ComboBoxDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/ComboBoxDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/ComboBoxDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/ComboBoxDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/ComboBoxDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenteyes.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/brenteyes.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenteyes.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/brenteyes.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenthair.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/brenthair.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenthair.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/brenthair.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brentmouth.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/brentmouth.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brentmouth.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/brentmouth.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeseyes.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/georgeseyes.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeseyes.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/georgeseyes.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeshair.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/georgeshair.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeshair.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/georgeshair.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgesmouth.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/georgesmouth.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgesmouth.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/georgesmouth.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanseyes.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/hanseyes.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanseyes.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/hanseyes.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanshair.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/hanshair.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanshair.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/hanshair.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hansmouth.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/hansmouth.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hansmouth.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/hansmouth.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardeyes.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/howardeyes.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardeyes.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/howardeyes.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardhair.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/howardhair.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardhair.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/howardhair.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardmouth.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/howardmouth.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardmouth.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/howardmouth.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameseyes.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jameseyes.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameseyes.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jameseyes.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameshair.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jameshair.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameshair.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jameshair.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jamesmouth.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jamesmouth.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jamesmouth.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jamesmouth.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffeyes.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jeffeyes.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffeyes.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jeffeyes.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffhair.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jeffhair.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffhair.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jeffhair.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffmouth.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jeffmouth.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffmouth.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jeffmouth.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/joneyes.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/joneyes.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/joneyes.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/joneyes.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonhair.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jonhair.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonhair.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jonhair.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonmouth.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jonmouth.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonmouth.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/jonmouth.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laraeyes.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/laraeyes.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laraeyes.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/laraeyes.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larahair.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/larahair.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larahair.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/larahair.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laramouth.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/laramouth.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laramouth.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/laramouth.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryeyes.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/larryeyes.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryeyes.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/larryeyes.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryhair.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/larryhair.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryhair.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/larryhair.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larrymouth.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/larrymouth.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larrymouth.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/larrymouth.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisaeyes.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/lisaeyes.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisaeyes.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/lisaeyes.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisahair.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/lisahair.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisahair.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/lisahair.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisamouth.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/lisamouth.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisamouth.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/lisamouth.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaeleyes.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/michaeleyes.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaeleyes.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/michaeleyes.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelhair.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/michaelhair.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelhair.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/michaelhair.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelmouth.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/michaelmouth.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelmouth.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/michaelmouth.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipeyes.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/philipeyes.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipeyes.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/philipeyes.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philiphair.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/philiphair.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philiphair.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/philiphair.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipmouth.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/philipmouth.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipmouth.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/philipmouth.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotteyes.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/scotteyes.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotteyes.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/scotteyes.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotthair.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/scotthair.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotthair.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/scotthair.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scottmouth.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/scottmouth.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scottmouth.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/combobox/resources/images/scottmouth.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/dialog/resources/DialogDemo.html b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/dialog/resources/DialogDemo.html similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/dialog/resources/DialogDemo.html rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/dialog/resources/DialogDemo.html diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/dialog/resources/images/DialogDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/dialog/resources/images/DialogDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/dialog/resources/images/DialogDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/dialog/resources/images/DialogDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/resources/EditorPaneDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/editorpane/resources/EditorPaneDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/resources/EditorPaneDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/editorpane/resources/EditorPaneDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/resources/images/EditorPaneDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/editorpane/resources/images/EditorPaneDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/editorpane/resources/images/EditorPaneDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/editorpane/resources/images/EditorPaneDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/FileChooserDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/filechooser/resources/FileChooserDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/FileChooserDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/filechooser/resources/FileChooserDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/FileChooserDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/filechooser/resources/images/FileChooserDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/FileChooserDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/filechooser/resources/images/FileChooserDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/apply.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/filechooser/resources/images/apply.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/apply.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/filechooser/resources/images/apply.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/fliphor.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/filechooser/resources/images/fliphor.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/fliphor.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/filechooser/resources/images/fliphor.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/flipvert.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/filechooser/resources/images/flipvert.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/flipvert.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/filechooser/resources/images/flipvert.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/rotateleft.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/filechooser/resources/images/rotateleft.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/rotateleft.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/filechooser/resources/images/rotateleft.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/rotateright.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/filechooser/resources/images/rotateright.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/rotateright.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/filechooser/resources/images/rotateright.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/frame/resources/FrameDemo.html b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/frame/resources/FrameDemo.html similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/frame/resources/FrameDemo.html rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/frame/resources/FrameDemo.html diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/frame/resources/images/FrameDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/frame/resources/images/FrameDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/frame/resources/images/FrameDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/frame/resources/images/FrameDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/gridbaglayout/resources/GridBagLayoutDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/gridbaglayout/resources/GridBagLayoutDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/gridbaglayout/resources/GridBagLayoutDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/gridbaglayout/resources/GridBagLayoutDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/gridbaglayout/resources/images/GridBagLayoutDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/gridbaglayout/resources/images/GridBagLayoutDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/gridbaglayout/resources/images/GridBagLayoutDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/gridbaglayout/resources/images/GridBagLayoutDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/InternalFrameDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/InternalFrameDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/InternalFrameDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/InternalFrameDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/InternalFrameDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/InternalFrameDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/InternalFrameDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/InternalFrameDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/bananas.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/bananas.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/bananas.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/bananas.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/bananas_small.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/bananas_small.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/bananas_small.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/bananas_small.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/globe.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/globe.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/globe.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/globe.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/globe_small.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/globe_small.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/globe_small.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/globe_small.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/package.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/package.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/package.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/package.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/package_small.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/package_small.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/package_small.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/package_small.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/soccer_ball.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/soccer_ball.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/soccer_ball.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/soccer_ball.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/soccer_ball_small.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/soccer_ball_small.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/internalframe/resources/images/soccer_ball_small.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/internalframe/resources/images/soccer_ball_small.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/ListDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/ListDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/ListDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/ListDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/ListDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/ListDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/ListDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/ListDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/blue.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/blue.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/blue.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/blue.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/cyan.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/cyan.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/cyan.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/cyan.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/gray.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/gray.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/gray.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/gray.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/green.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/green.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/green.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/green.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/magenta.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/magenta.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/magenta.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/magenta.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/red.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/red.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/red.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/red.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/yellow.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/yellow.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/yellow.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/list/resources/images/yellow.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/OptionPaneDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/optionpane/resources/OptionPaneDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/OptionPaneDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/optionpane/resources/OptionPaneDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/OptionPaneDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/optionpane/resources/images/OptionPaneDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/OptionPaneDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/optionpane/resources/images/OptionPaneDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/bottle.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/optionpane/resources/images/bottle.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/bottle.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/optionpane/resources/images/bottle.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/ProgressBarDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/progressbar/resources/ProgressBarDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/ProgressBarDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/progressbar/resources/ProgressBarDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/images/ProgressBarDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/progressbar/resources/images/ProgressBarDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/images/ProgressBarDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/progressbar/resources/images/ProgressBarDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/ScrollPaneDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/ScrollPaneDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/ScrollPaneDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/ScrollPaneDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/COPYRIGHT b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/COPYRIGHT similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/COPYRIGHT rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/COPYRIGHT diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/ScrollPaneDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/ScrollPaneDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/ScrollPaneDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/ScrollPaneDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/colheader.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/colheader.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/colheader.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/colheader.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/crayons.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/crayons.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/crayons.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/crayons.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/lowerleft.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/lowerleft.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/lowerleft.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/lowerleft.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/rowheader.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/rowheader.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/rowheader.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/rowheader.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperleft.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/upperleft.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperleft.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/upperleft.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperright.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/upperright.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperright.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/scrollpane/resources/images/upperright.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/slider/resources/SliderDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/slider/resources/SliderDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/slider/resources/SliderDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/slider/resources/SliderDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/slider/resources/images/SliderDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/slider/resources/images/SliderDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/slider/resources/images/SliderDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/slider/resources/images/SliderDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/SpinnerDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/spinner/resources/SpinnerDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/SpinnerDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/spinner/resources/SpinnerDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/images/SpinnerDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/spinner/resources/images/SpinnerDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/images/SpinnerDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/spinner/resources/images/SpinnerDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/SplitPaneDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/splitpane/resources/SplitPaneDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/SplitPaneDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/splitpane/resources/SplitPaneDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/SplitPaneDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/splitpane/resources/images/SplitPaneDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/SplitPaneDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/splitpane/resources/images/SplitPaneDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/day.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/splitpane/resources/images/day.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/day.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/splitpane/resources/images/day.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/night.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/splitpane/resources/images/night.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/night.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/splitpane/resources/images/night.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/TabbedPaneDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/TabbedPaneDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/TabbedPaneDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/TabbedPaneDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/TabbedPaneDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/TabbedPaneDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/TabbedPaneDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/TabbedPaneDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/blake.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/blake.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/blake.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/blake.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/brooke.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/brooke.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/brooke.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/brooke.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/camille.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/camille.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/camille.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/camille.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/david.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/david.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/david.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/david.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/matthew.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/matthew.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/matthew.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/matthew.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/miranda.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/miranda.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/miranda.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/miranda.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/stephen.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/stephen.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/stephen.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tabbedpane/resources/images/stephen.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/resources/TableDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/table/resources/TableDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/table/resources/TableDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/table/resources/TableDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/resources/bestpicture b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/table/resources/bestpicture similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/table/resources/bestpicture rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/table/resources/bestpicture diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/resources/images/TableDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/table/resources/images/TableDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/table/resources/images/TableDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/table/resources/images/TableDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/resources/images/goldstar.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/table/resources/images/goldstar.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/table/resources/images/goldstar.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/table/resources/images/goldstar.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/resources/images/nominee.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/table/resources/images/nominee.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/table/resources/images/nominee.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/table/resources/images/nominee.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/table/resources/oscars.xml b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/table/resources/oscars.xml similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/table/resources/oscars.xml rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/table/resources/oscars.xml diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/TextFieldDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/textfield/resources/TextFieldDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/TextFieldDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/textfield/resources/TextFieldDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/images/TextFieldDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/textfield/resources/images/TextFieldDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/images/TextFieldDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/textfield/resources/images/TextFieldDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/ToggleButtonDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/ToggleButtonDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/ToggleButtonDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/ToggleButtonDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ToggleButtonDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/ToggleButtonDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ToggleButtonDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/ToggleButtonDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b1.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b1.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1d.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b1d.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1d.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b1d.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1p.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b1p.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1p.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b1p.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1r.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b1r.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1r.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b1r.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b2.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b2.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2d.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b2d.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2d.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b2d.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2p.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b2p.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2p.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b2p.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2r.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b2r.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2r.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b2r.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b3.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b3.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3d.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b3d.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3d.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b3d.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3p.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b3p.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3p.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b3p.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3r.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b3r.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3r.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/b3r.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bl.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/bl.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bl.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/bl.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bldn.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/bldn.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bldn.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/bldn.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bm.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/bm.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bm.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/bm.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bmdn.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/bmdn.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bmdn.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/bmdn.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/br.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/br.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/br.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/br.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/brdn.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/brdn.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/brdn.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/brdn.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/c.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/c.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/c.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/c.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cb.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/cb.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cb.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/cb.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbr.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/cbr.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbr.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/cbr.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbrs.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/cbrs.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbrs.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/cbrs.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbs.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/cbs.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbs.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/cbs.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cdn.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/cdn.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cdn.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/cdn.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ml.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/ml.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ml.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/ml.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mldn.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/mldn.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mldn.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/mldn.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mr.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/mr.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mr.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/mr.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mrdn.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/mrdn.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mrdn.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/mrdn.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rb.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/rb.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rb.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/rb.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbp.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/rbp.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbp.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/rbp.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbr.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/rbr.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbr.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/rbr.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbrs.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/rbrs.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbrs.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/rbrs.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbs.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/rbs.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbs.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/rbs.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tl.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/tl.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tl.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/tl.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tldn.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/tldn.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tldn.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/tldn.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tm.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/tm.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tm.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/tm.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tmdn.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/tmdn.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tmdn.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/tmdn.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tr.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/tr.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tr.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/tr.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/trdn.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/trdn.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/trdn.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/togglebutton/resources/images/trdn.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tooltip/resources/ToolTipDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tooltip/resources/ToolTipDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tooltip/resources/ToolTipDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tooltip/resources/ToolTipDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tooltip/resources/images/ToolTipDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tooltip/resources/images/ToolTipDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tooltip/resources/images/ToolTipDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tooltip/resources/images/ToolTipDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tooltip/resources/images/tooltip_background.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tooltip/resources/images/tooltip_background.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tooltip/resources/images/tooltip_background.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tooltip/resources/images/tooltip_background.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tree/resources/TreeDemo.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tree/resources/TreeDemo.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tree/resources/TreeDemo.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tree/resources/TreeDemo.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tree/resources/images/TreeDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tree/resources/images/TreeDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tree/resources/images/TreeDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tree/resources/images/TreeDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/tree/resources/tree.txt b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tree/resources/tree.txt similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/tree/resources/tree.txt rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/tree/resources/tree.txt diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/window/resources/WindowDemo.html b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/window/resources/WindowDemo.html similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/window/resources/WindowDemo.html rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/window/resources/WindowDemo.html diff --git a/trunk/SwingSet3/src/com/sun/swingset3/demos/window/resources/images/WindowDemo.gif b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/window/resources/images/WindowDemo.gif similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/demos/window/resources/images/WindowDemo.gif rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/demos/window/resources/images/WindowDemo.gif diff --git a/trunk/SwingSet3/src/com/sun/swingset3/resources/SwingSet3.properties b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/SwingSet3.properties similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/resources/SwingSet3.properties rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/SwingSet3.properties diff --git a/trunk/SwingSet3/src/com/sun/swingset3/resources/default.html b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/default.html similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/resources/default.html rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/default.html diff --git a/trunk/SwingSet3/src/com/sun/swingset3/resources/images/about.jpg b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/images/about.jpg similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/resources/images/about.jpg rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/images/about.jpg diff --git a/trunk/SwingSet3/src/com/sun/swingset3/resources/images/home.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/images/home.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/resources/images/home.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/images/home.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/resources/images/home_notext.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/images/home_notext.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/resources/images/home_notext.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/images/home_notext.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/resources/images/home_text.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/images/home_text.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/resources/images/home_text.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/images/home_text.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/resources/images/splash.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/images/splash.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/resources/images/splash.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/images/splash.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/resources/images/ss3_splash_nointro.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/images/ss3_splash_nointro.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/resources/images/ss3_splash_nointro.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/images/ss3_splash_nointro.png diff --git a/trunk/SwingSet3/src/com/sun/swingset3/resources/images/swingset3_icon.png b/trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/images/swingset3_icon.png similarity index 100% rename from trunk/SwingSet3/src/com/sun/swingset3/resources/images/swingset3_icon.png rename to trunk/SwingSet3/src/main/resources/com/sun/swingset3/resources/images/swingset3_icon.png