Browse files

Moved all the UI stuff on to javax.swing layout for Java 6.

Worked on prepping for 6.9...still not there yet.
  • Loading branch information...
1 parent 797cc88 commit 9df71b97c75c4cc9c7b81e7df909fdc3e156cca9 Eric Thorsen committed Jun 21, 2010
Showing with 602 additions and 1,295 deletions.
  1. +5 −5 netbeans/Netbeans 6.8/pom.xml
  2. +10 −29 netbeans/plugins/org-enclojure-plugin/pom.xml
  3. +2 −2 ...ns/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/actions/ConnectExternalReplDialog.form
  4. +42 −42 ...ns/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/actions/ConnectExternalReplDialog.java
  5. +2 −2 ...s/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/actions/CreateStandaloneReplDialog.form
  6. +48 −48 ...s/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/actions/CreateStandaloneReplDialog.java
  7. +42 −42 ...clojure-plugin/src/main/java/org/enclojure/ide/nb/clojure/project/ClojureTemplatePanelVisual.java
  8. +5 −5 ...eans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/ReplTopComponent.java
  9. +0 −1 netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/layer.xml
  10. +2 −2 ...plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/source/CljSourceVisualPanel1.form
  11. +44 −44 ...plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/source/CljSourceVisualPanel1.java
  12. +2 −2 ...s/org-enclojure-plugin/src/main/java/org/enclojure/ide/preferences/EnclojurePreferencesPanel.form
  13. +206 −206 ...s/org-enclojure-plugin/src/main/java/org/enclojure/ide/preferences/EnclojurePreferencesPanel.java
  14. +2 −2 .../org-enclojure-plugin/src/main/java/org/enclojure/ide/preferences/ReplPropertiesTopComponent.form
  15. +9 −9 .../org-enclojure-plugin/src/main/java/org/enclojure/ide/preferences/ReplPropertiesTopComponent.java
  16. +0 −122 ...enclojure-plugin/src/main/java/org/enclojure/ide/project/samples/RelevanceLabReplPanelVisual.form
  17. +0 −260 ...enclojure-plugin/src/main/java/org/enclojure/ide/project/samples/RelevanceLabReplPanelVisual.java
  18. +0 −220 ...lojure-plugin/src/main/java/org/enclojure/ide/project/samples/RelevanceLabReplWizardIterator.java
  19. +0 −88 ...enclojure-plugin/src/main/java/org/enclojure/ide/project/samples/RelevanceLabReplWizardPanel.java
  20. BIN ...ain/resources/org/enclojure/ide/project/samples/ClojureProjectTemplate/ClojureProjectTemplate.zip
  21. BIN ...clojure-plugin/src/main/resources/org/enclojure/ide/templates/project/Clojure-1.1/Clojure-1.1.zip
  22. BIN .../main/resources/org/enclojure/ide/templates/project/Clojure-1.2-SNAPSHOT/Clojure-1.2-SNAPSHOT.zip
  23. +1 −1 netbeans/pom.xml
  24. +17 −6 org-enclojure-ide/pom.xml
  25. +2 −2 org-enclojure-ide/src/main/java/org/enclojure/ide/navigator/views/CljNavigatorViewPanel.form
  26. +9 −9 org-enclojure-ide/src/main/java/org/enclojure/ide/navigator/views/CljNavigatorViewPanel.java
  27. +11 −5 org-enclojure-repl-client/pom.xml
  28. +2 −2 org-enclojure-repl-client/src/main/java/org/enclojure/ide/repl/ReplHistory.form
  29. +9 −9 org-enclojure-repl-client/src/main/java/org/enclojure/ide/repl/ReplHistory.java
  30. +2 −2 org-enclojure-repl-client/src/main/java/org/enclojure/ide/repl/ReplInfoFrame.form
  31. +10 −10 org-enclojure-repl-client/src/main/java/org/enclojure/ide/repl/ReplInfoFrame.java
  32. +2 −2 org-enclojure-repl-client/src/main/java/org/enclojure/ide/repl/ReplManagerPanel.form
  33. +102 −102 org-enclojure-repl-client/src/main/java/org/enclojure/ide/repl/ReplManagerPanel.java
  34. +2 −2 org-enclojure-repl-client/src/main/java/org/enclojure/ide/repl/ReplPanel.form
  35. +9 −9 org-enclojure-repl-client/src/main/java/org/enclojure/ide/repl/ReplPanel.java
  36. +3 −3 pom.xml
View
10 netbeans/Netbeans 6.8/pom.xml
@@ -15,31 +15,31 @@
<dependency>
<groupId>org.netbeans.cluster</groupId>
<artifactId>websvccommon1</artifactId>
- <version>${netbeans.version}</version>
+ <version>${netbeans.release}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.netbeans.cluster</groupId>
<artifactId>platform11</artifactId>
- <version>${netbeans.version}</version>
+ <version>${netbeans.release}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.netbeans.cluster</groupId>
<artifactId>ide12</artifactId>
- <version>${netbeans.version}</version>
+ <version>${netbeans.release}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.netbeans.cluster</groupId>
<artifactId>nb6.8</artifactId>
- <version>${netbeans.version}</version>
+ <version>${netbeans.release}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.netbeans.cluster</groupId>
<artifactId>java</artifactId>
- <version>${netbeans.version}</version>
+ <version>${netbeans.release}</version>
<type>pom</type>
</dependency>
<dependency>
View
39 netbeans/plugins/org-enclojure-plugin/pom.xml
@@ -16,16 +16,9 @@
<project.templates.dest></project.templates.dest>
<sample.projects.source>${templates.basedir}/netbeans/SampleProjects</sample.projects.source>
<sample.projects.dest></sample.projects.dest>
- <netbeans.release>RELEASE68</netbeans.release>
+ <netbeans.release>RELEASE69</netbeans.release>
</properties>
- <!-- <parent>
- <artifactId>lib</artifactId>
- <groupId>org.enclojure</groupId>
- <version>1.1.0</version>
- </parent>
- -->
-
<repositories>
<!-- this is a remote repository hosting the netbeans api artifacts.
the versions of the artifacts are netbeans IDE release based, eg. RELEASE65.
@@ -35,6 +28,9 @@
<id>netbeans</id>
<name>repository hosting netbeans.org api artifacts</name>
<url>http://bits.netbeans.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<repository>
<id>clojure-releases</id>
@@ -161,7 +157,7 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-loaders</artifactId>
- <version>${netbeans.release}</version>
+ <version>RELEASE69</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
@@ -279,11 +275,6 @@
<version>${netbeans.release}</version>
</dependency>
<dependency>
- <groupId>org.netbeans.modules</groupId>
- <artifactId>org-netbeans-modules-templates</artifactId>
- <version>${netbeans.release}</version>
- </dependency>
- <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-spi-editor-hints</artifactId>
<version>${netbeans.release}</version>
@@ -341,16 +332,10 @@
<version>${netbeans.release}</version>
</dependency>
<dependency>
- <artifactId>swing-layout-1.0.4</artifactId>
- <groupId>org.netbeans.external</groupId>
- <type>jar</type>
- <version>${netbeans.release}</version>
- </dependency>
- <dependency>
<artifactId>script-api</artifactId>
<groupId>org.netbeans.external</groupId>
<type>jar</type>
- <version>${netbeans.release}</version>
+ <version>RELEASE68</version>
</dependency>
<dependency>
<artifactId>slf4j-api</artifactId>
@@ -397,11 +382,6 @@
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
- <artifactId>org-jdesktop-layout</artifactId>
- <version>${netbeans.release}</version>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
<artifactId>org-openide-actions</artifactId>
<version>${netbeans.release}</version>
</dependency>
@@ -487,8 +467,8 @@
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
- <artifactId>org-netbeans-libs-jsr223</artifactId>
- <version>${netbeans.release}</version>
+ <artifactId>org-openide-util-lookup</artifactId>
+ <version>RELEASE69</version>
</dependency>
</dependencies>
@@ -748,11 +728,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<extensions>true</extensions>
<configuration>
<descriptor>src/main/nbm/module.xml</descriptor>
<brandingToken>Enclojure.org</brandingToken>
+ <useOSGiDependencies>false</useOSGiDependencies>
<!-- <netbeansInstallation>/Applications/NetBeans/NetBeans 6.8.app/Content/Resrouces/Netbeans</netbeansInstallation> -->
</configuration>
</plugin>
View
4 ...nclojure-plugin/src/main/java/org/enclojure/ide/nb/actions/ConnectExternalReplDialog.form
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.1" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Properties>
@@ -14,7 +14,7 @@
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+ <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
View
84 ...nclojure-plugin/src/main/java/org/enclojure/ide/nb/actions/ConnectExternalReplDialog.java
@@ -80,58 +80,58 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
}
});
- errorLabel.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
+ errorLabel.setFont(new java.awt.Font("Lucida Grande", 1, 13));
errorLabel.setForeground(new java.awt.Color(255, 0, 0));
errorLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
errorLabel.setText(org.openide.util.NbBundle.getMessage(ConnectExternalReplDialog.class, "ConnectExternalReplDialog.errorLabel.text")); // NOI18N
- org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(getContentPane());
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
.addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(org.jdesktop.layout.GroupLayout.LEADING, errorLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 440, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
- .add(jLabel1)
- .add(54, 54, 54)
- .add(replName, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 313, Short.MAX_VALUE))
- .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
- .add(jLabel2)
- .add(18, 18, 18)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(connectButton)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(cancelButton))
- .add(layout.createSequentialGroup()
- .add(replServerHost, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 164, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(jLabel3)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(replServerPort, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 96, Short.MAX_VALUE)))))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(errorLabel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 440, Short.MAX_VALUE)
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+ .addComponent(jLabel1)
+ .addGap(54, 54, 54)
+ .addComponent(replName, javax.swing.GroupLayout.DEFAULT_SIZE, 313, Short.MAX_VALUE))
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+ .addComponent(jLabel2)
+ .addGap(18, 18, 18)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(connectButton)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(cancelButton))
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(replServerHost, javax.swing.GroupLayout.PREFERRED_SIZE, 164, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(jLabel3)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(replServerPort, javax.swing.GroupLayout.DEFAULT_SIZE, 96, Short.MAX_VALUE)))))
.addContainerGap())
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(20, 20, 20)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(replName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel1))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel2)
- .add(replServerHost, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel3)
- .add(replServerPort, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(connectButton)
- .add(cancelButton))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(errorLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 36, Short.MAX_VALUE))
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGap(20, 20, 20)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(replName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel1))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel2)
+ .addComponent(replServerHost, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel3)
+ .addComponent(replServerPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(connectButton)
+ .addComponent(cancelButton))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(errorLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 36, Short.MAX_VALUE))
);
pack();
View
4 ...clojure-plugin/src/main/java/org/enclojure/ide/nb/actions/CreateStandaloneReplDialog.form
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.1" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Properties>
@@ -13,7 +13,7 @@
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+ <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
View
96 ...clojure-plugin/src/main/java/org/enclojure/ide/nb/actions/CreateStandaloneReplDialog.java
@@ -102,61 +102,61 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
replName.setText(org.openide.util.NbBundle.getMessage(CreateStandaloneReplDialog.class, "CreateStandaloneReplDialog.replName.text")); // NOI18N
- org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(getContentPane());
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(jLabel3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(layout.createSequentialGroup()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jLabel1)
- .add(jLabel4)
- .add(jLabel2))
- .add(50, 50, 50))
- .add(layout.createSequentialGroup()
- .add(connectButton)
- .add(18, 18, 18)))
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(replName, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 630, Short.MAX_VALUE)
- .add(javaArgs, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 630, Short.MAX_VALUE)
- .add(classPath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 630, Short.MAX_VALUE)
- .add(layout.createSequentialGroup()
- .add(cancelButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(errorLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 535, Short.MAX_VALUE)))))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(jLabel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel1)
+ .addComponent(jLabel4)
+ .addComponent(jLabel2))
+ .addGap(50, 50, 50))
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(connectButton)
+ .addGap(18, 18, 18)))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(replName, javax.swing.GroupLayout.DEFAULT_SIZE, 630, Short.MAX_VALUE)
+ .addComponent(javaArgs, javax.swing.GroupLayout.DEFAULT_SIZE, 630, Short.MAX_VALUE)
+ .addComponent(classPath, javax.swing.GroupLayout.DEFAULT_SIZE, 630, Short.MAX_VALUE)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(cancelButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(errorLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 535, Short.MAX_VALUE)))))
.addContainerGap())
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
.addContainerGap(20, Short.MAX_VALUE)
- .add(jLabel3)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(replName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel4))
- .add(5, 5, 5)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(javaArgs, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel1))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(layout.createSequentialGroup()
- .add(jLabel2)
- .add(18, 18, 18)
- .add(connectButton))
- .add(layout.createSequentialGroup()
- .add(classPath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(errorLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(cancelButton))))
- .add(91, 91, 91))
+ .addComponent(jLabel3)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(replName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel4))
+ .addGap(5, 5, 5)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(javaArgs, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel1))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(jLabel2)
+ .addGap(18, 18, 18)
+ .addComponent(connectButton))
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(classPath, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(errorLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 27, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(cancelButton))))
+ .addGap(91, 91, 91))
);
pack();
View
84 ...plugin/src/main/java/org/enclojure/ide/nb/clojure/project/ClojureTemplatePanelVisual.java
@@ -107,55 +107,55 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
}
});
- org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
.addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(projectNameLabel)
- .add(projectNameLabel1))
- .add(37, 37, 37)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(packageNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 639, Short.MAX_VALUE)
- .add(projectNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 639, Short.MAX_VALUE)))
- .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
- .add(23, 23, 23)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(projectLocationLabel)
- .add(createdFolderLabel))
- .add(10, 10, 10)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(projectLocationTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 584, Short.MAX_VALUE)
- .add(createdFolderTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 584, Short.MAX_VALUE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(browseButton)))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(projectNameLabel)
+ .addComponent(projectNameLabel1))
+ .addGap(37, 37, 37)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(packageNameTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 639, Short.MAX_VALUE)
+ .addComponent(projectNameTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 639, Short.MAX_VALUE)))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addGap(23, 23, 23)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(projectLocationLabel)
+ .addComponent(createdFolderLabel))
+ .addGap(10, 10, 10)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(projectLocationTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 584, Short.MAX_VALUE)
+ .addComponent(createdFolderTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 584, Short.MAX_VALUE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(browseButton)))
.addContainerGap())
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
.addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(projectNameLabel)
- .add(projectNameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(projectNameLabel1)
- .add(packageNameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(18, 18, 18)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(projectLocationLabel)
- .add(projectLocationTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(browseButton))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(createdFolderLabel)
- .add(createdFolderTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(projectNameLabel)
+ .addComponent(projectNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(projectNameLabel1)
+ .addComponent(packageNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(18, 18, 18)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(projectLocationLabel)
+ .addComponent(projectLocationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(browseButton))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(createdFolderLabel)
+ .addComponent(createdFolderTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
projectNameLabel.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(ClojureTemplatePanelVisual.class, "ClojureTemplatePanelVisual.projectNameLabel.text")); // NOI18N
View
10 ...gins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/ReplTopComponent.java
@@ -244,15 +244,15 @@ public void focusGained(java.awt.event.FocusEvent evt) {
}
});
- org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 708, Short.MAX_VALUE)
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 708, Short.MAX_VALUE)
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 211, Short.MAX_VALUE)
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 211, Short.MAX_VALUE)
);
}// </editor-fold>//GEN-END:initComponents
View
1 netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/layer.xml
@@ -588,7 +588,6 @@
<file name="ClojureMimeTypeResolver.xml" url="ClojureMimeTypeResolver.xml">
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.enclojure.ide.nb.editor.Bundle"/>
<attr name="position" intvalue="1234"/>
-
</file>
</folder>
</folder>
View
4 ...org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/source/CljSourceVisualPanel1.form
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.1" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>
@@ -7,7 +7,7 @@
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+ <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
View
88 ...org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/source/CljSourceVisualPanel1.java
@@ -83,56 +83,56 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
packagesComboBox.setEditable(true);
- org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
.addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jLabel4)
- .add(jLabel5)
- .add(jLabel6))
- .add(77, 77, 77)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(createdFileTextField)
- .add(projectTextField)
- .add(sourceRootsComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 421, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
- .add(layout.createSequentialGroup()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jLabel2)
- .add(jLabel3))
- .add(30, 30, 30)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(packagesComboBox, 0, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(filenameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 448, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel4)
+ .addComponent(jLabel5)
+ .addComponent(jLabel6))
+ .addGap(77, 77, 77)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(createdFileTextField)
+ .addComponent(projectTextField)
+ .addComponent(sourceRootsComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 421, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel2)
+ .addComponent(jLabel3))
+ .addGap(30, 30, 30)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(packagesComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(filenameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 448, javax.swing.GroupLayout.PREFERRED_SIZE))))
.addContainerGap(20, Short.MAX_VALUE))
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(20, 20, 20)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel2)
- .add(filenameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel3)
- .add(packagesComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel6)
- .add(sourceRootsComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel4)
- .add(projectTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel5)
- .add(createdFileTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGap(20, 20, 20)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel2)
+ .addComponent(filenameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel3)
+ .addComponent(packagesComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel6)
+ .addComponent(sourceRootsComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel4)
+ .addComponent(projectTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel5)
+ .addComponent(createdFileTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(35, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents
View
4 ...clojure-plugin/src/main/java/org/enclojure/ide/preferences/EnclojurePreferencesPanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.1" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<NonVisualComponents>
@@ -39,7 +39,7 @@
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+ <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
View
412 ...clojure-plugin/src/main/java/org/enclojure/ide/preferences/EnclojurePreferencesPanel.java
@@ -272,162 +272,162 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
}
});
- org.jdesktop.layout.GroupLayout jPanel2Layout = new org.jdesktop.layout.GroupLayout(jPanel2);
+ javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
jPanel2.setLayout(jPanel2Layout);
jPanel2Layout.setHorizontalGroup(
- jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel2Layout.createSequentialGroup()
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel2Layout.createSequentialGroup()
+ jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel2Layout.createSequentialGroup()
.addContainerGap()
- .add(jLabel2))
- .add(jPanel2Layout.createSequentialGroup()
- .add(20, 20, 20)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel2Layout.createSequentialGroup()
- .add(jLabel12)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jLabel14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 450, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(jPanel2Layout.createSequentialGroup()
- .add(jLabel13)
- .add(18, 18, 18)
- .add(clojurePlatformsComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 251, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(18, 18, 18)
- .add(includeAllClasspathsCheckBox))))
- .add(jPanel2Layout.createSequentialGroup()
- .add(30, 30, 30)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(warnOnReflectionCheckBox)
- .add(printStackTraceCheckBox)
- .add(jPanel2Layout.createSequentialGroup()
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jLabel1)
- .add(jLabel3))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(printLevelTextField)
- .add(printLengthTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
- .add(enableLogging))
- .add(38, 38, 38)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, jPanel2Layout.createSequentialGroup()
- .add(19, 19, 19)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(printSharedCheckBox)
- .add(printSuppressNamespaceCheckBox)
- .add(printCircleCheckBox)
- .add(jPanel2Layout.createSequentialGroup()
- .add(8, 8, 8)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jLabel6)
- .add(jLabel9))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(jPanel2Layout.createSequentialGroup()
- .add(printRightMarginTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jLabel8))
- .add(jPanel2Layout.createSequentialGroup()
- .add(printLinesTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jLabel10)))
- .add(18, 18, 18)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(printMiserWidthTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, printBaseTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
- .add(printRadixCheckBox))
- .add(276, 276, 276))
- .add(jPanel2Layout.createSequentialGroup()
- .add(usePrettyPrintCheckBox)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jLabel11)
- .add(90, 90, 90))))
- .add(jPanel2Layout.createSequentialGroup()
+ .addComponent(jLabel2))
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addGap(20, 20, 20)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addComponent(jLabel12)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabel14, javax.swing.GroupLayout.PREFERRED_SIZE, 450, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addComponent(jLabel13)
+ .addGap(18, 18, 18)
+ .addComponent(clojurePlatformsComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 251, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(18, 18, 18)
+ .addComponent(includeAllClasspathsCheckBox))))
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addGap(30, 30, 30)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(warnOnReflectionCheckBox)
+ .addComponent(printStackTraceCheckBox)
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel1)
+ .addComponent(jLabel3))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(printLevelTextField)
+ .addComponent(printLengthTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addComponent(enableLogging))
+ .addGap(38, 38, 38)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+ .addGap(19, 19, 19)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(printSharedCheckBox)
+ .addComponent(printSuppressNamespaceCheckBox)
+ .addComponent(printCircleCheckBox)
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addGap(8, 8, 8)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel6)
+ .addComponent(jLabel9))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addComponent(printRightMarginTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabel8))
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addComponent(printLinesTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabel10)))
+ .addGap(18, 18, 18)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(printMiserWidthTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(printBaseTextField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addComponent(printRadixCheckBox))
+ .addGap(276, 276, 276))
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addComponent(usePrettyPrintCheckBox)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabel11)
+ .addGap(90, 90, 90))))
+ .addGroup(jPanel2Layout.createSequentialGroup()
.addContainerGap()
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
- .add(org.jdesktop.layout.GroupLayout.LEADING, jSeparator2)
- .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel2Layout.createSequentialGroup()
- .add(jLabel15)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jvmAdditionArgsTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 556, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))))
- .add(244, 244, 244))
- .add(jPanel2Layout.createSequentialGroup()
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
+ .addComponent(jSeparator2, javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, jPanel2Layout.createSequentialGroup()
+ .addComponent(jLabel15)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jvmAdditionArgsTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 556, javax.swing.GroupLayout.PREFERRED_SIZE)))))
+ .addGap(244, 244, 244))
+ .addGroup(jPanel2Layout.createSequentialGroup()
.addContainerGap()
- .add(jSeparator3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 682, Short.MAX_VALUE)
- .add(488, 488, 488))
- .add(jPanel2Layout.createSequentialGroup()
+ .addComponent(jSeparator3, javax.swing.GroupLayout.DEFAULT_SIZE, 682, Short.MAX_VALUE)
+ .addGap(488, 488, 488))
+ .addGroup(jPanel2Layout.createSequentialGroup()
.addContainerGap()
- .add(enableIDEReplCheckBox)
+ .addComponent(enableIDEReplCheckBox)
.addContainerGap(1044, Short.MAX_VALUE))
);
jPanel2Layout.setVerticalGroup(
- jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel2Layout.createSequentialGroup()
- .add(jLabel2)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel2Layout.createSequentialGroup()
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(usePrettyPrintCheckBox)
- .add(jLabel11))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(jPanel2Layout.createSequentialGroup()
- .add(printRadixCheckBox)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(printCircleCheckBox)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(printSharedCheckBox)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(printSuppressNamespaceCheckBox)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel6)
- .add(printRightMarginTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel8))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel9)
- .add(printLinesTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel10)))
- .add(jPanel2Layout.createSequentialGroup()
- .add(printMiserWidthTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(printBaseTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
- .add(jPanel2Layout.createSequentialGroup()
- .add(warnOnReflectionCheckBox)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(printStackTraceCheckBox)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(enableLogging)
- .add(10, 10, 10)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel1)
- .add(printLengthTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel3)
- .add(printLevelTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 9, Short.MAX_VALUE)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel15)
- .add(jvmAdditionArgsTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(8, 8, 8)
- .add(jSeparator2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel12)
- .add(jLabel14))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel13)
- .add(clojurePlatformsComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(includeAllClasspathsCheckBox))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jSeparator3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(enableIDEReplCheckBox)
- .add(39, 39, 39))
+ jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addComponent(jLabel2)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(usePrettyPrintCheckBox)
+ .addComponent(jLabel11))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addComponent(printRadixCheckBox)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(printCircleCheckBox)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(printSharedCheckBox)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(printSuppressNamespaceCheckBox)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel6)
+ .addComponent(printRightMarginTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel8))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel9)
+ .addComponent(printLinesTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel10)))
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addComponent(printMiserWidthTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(printBaseTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addComponent(warnOnReflectionCheckBox)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(printStackTraceCheckBox)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(enableLogging)
+ .addGap(10, 10, 10)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel1)
+ .addComponent(printLengthTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel3)
+ .addComponent(printLevelTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 9, Short.MAX_VALUE)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel15)
+ .addComponent(jvmAdditionArgsTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(8, 8, 8)
+ .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel12)
+ .addComponent(jLabel14))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel13)
+ .addComponent(clojurePlatformsComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(includeAllClasspathsCheckBox))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jSeparator3, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(enableIDEReplCheckBox)
+ .addGap(39, 39, 39))
);
jTabbedPane1.addTab("REPL Settings", jPanel2);
@@ -514,73 +514,73 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) {
}
});
- org.jdesktop.layout.GroupLayout jPanelSettingsLayout = new org.jdesktop.layout.GroupLayout(jPanelSettings);
+ javax.swing.GroupLayout jPanelSettingsLayout = new javax.swing.GroupLayout(jPanelSettings);
jPanelSettings.setLayout(jPanelSettingsLayout);
jPanelSettingsLayout.setHorizontalGroup(
- jPanelSettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanelSettingsLayout.createSequentialGroup()
+ jPanelSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanelSettingsLayout.createSequentialGroup()
.addContainerGap()
- .add(jPanelSettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(platformScrollPane, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 214, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jPanelSettingsLayout.createSequentialGroup()
- .add(addPlatformButton)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(removePlatformButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 91, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(jLabel4))
- .add(15, 15, 15)
- .add(jSeparator1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanelSettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanelSettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanelSettingsLayout.createSequentialGroup()
- .add(jPanelSettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanelSettingsLayout.createSequentialGroup()
- .add(jLabel5, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 102, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(1, 1, 1)
- .add(platformNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 684, Short.MAX_VALUE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(setAsDefaultCheckBoxGuy))
- .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 914, Short.MAX_VALUE)
- .add(errorLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 914, Short.MAX_VALUE))
- .add(0, 0, 0))
- .add(jPanelSettingsLayout.createSequentialGroup()
- .add(addClasspathButton)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(removeClasspathButton)
+ .addGroup(jPanelSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(platformScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 214, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGroup(jPanelSettingsLayout.createSequentialGroup()
+ .addComponent(addPlatformButton)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(removePlatformButton, javax.swing.GroupLayout.PREFERRED_SIZE, 91, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(jLabel4))
+ .addGap(15, 15, 15)
+ .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanelSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanelSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanelSettingsLayout.createSequentialGroup()
+ .addGroup(jPanelSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanelSettingsLayout.createSequentialGroup()
+ .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 102, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(1, 1, 1)
+ .addComponent(platformNameTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 684, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(setAsDefaultCheckBoxGuy))
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 914, Short.MAX_VALUE)
+ .addComponent(errorLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 914, Short.MAX_VALUE))
+ .addGap(0, 0, 0))
+ .addGroup(jPanelSettingsLayout.createSequentialGroup()
+ .addComponent(addClasspathButton)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(removeClasspathButton)
.addContainerGap()))
- .add(jPanelSettingsLayout.createSequentialGroup()
- .add(jLabel7)
+ .addGroup(jPanelSettingsLayout.createSequentialGroup()
+ .addComponent(jLabel7)
.addContainerGap())))
);
jPanelSettingsLayout.setVerticalGroup(
- jPanelSettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanelSettingsLayout.createSequentialGroup()
- .add(jPanelSettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanelSettingsLayout.createSequentialGroup()
- .add(jLabel4)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(platformScrollPane, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 308, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanelSettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(removePlatformButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(addPlatformButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
- .add(jSeparator1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 399, Short.MAX_VALUE)
- .add(jPanelSettingsLayout.createSequentialGroup()
+ jPanelSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanelSettingsLayout.createSequentialGroup()
+ .addGroup(jPanelSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanelSettingsLayout.createSequentialGroup()
+ .addComponent(jLabel4)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(platformScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 308, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanelSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(removePlatformButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(addPlatformButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ .addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 399, Short.MAX_VALUE)
+ .addGroup(jPanelSettingsLayout.createSequentialGroup()
.addContainerGap()
- .add(errorLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanelSettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel5)
- .add(platformNameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(setAsDefaultCheckBoxGuy))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jLabel7)
- .add(4, 4, 4)
- .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 254, Short.MAX_VALUE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(jPanelSettingsLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(addClasspathButton)
- .add(removeClasspathButton))))
+ .addComponent(errorLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanelSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel5)
+ .addComponent(platformNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(setAsDefaultCheckBoxGuy))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabel7)
+ .addGap(4, 4, 4)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 254, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(jPanelSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(addClasspathButton)
+ .addComponent(removeClasspathButton))))
.addContainerGap())
);
View
4 ...lojure-plugin/src/main/java/org/enclojure/ide/preferences/ReplPropertiesTopComponent.form
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.1" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>
@@ -7,7 +7,7 @@
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+ <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
View
18 ...lojure-plugin/src/main/java/org/enclojure/ide/preferences/ReplPropertiesTopComponent.java
@@ -44,19 +44,19 @@ private void initComponents() {
jvmArgsTextArea.setRows(5);
jScrollPane1.setViewportView(jvmArgsTextArea);
- org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(jScrollPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 981, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 981, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(jScrollPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 387, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 387, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents
View
122 ...e-plugin/src/main/java/org/enclojure/ide/project/samples/RelevanceLabReplPanelVisual.form
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
- <AuxValues>
- <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
- <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
- <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
- <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
- <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
- <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- </AuxValues>
-
- <Layout>
- <DimensionLayout dim="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="projectNameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="projectLocationLabel" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="createdFolderLabel" alignment="0" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="projectNameTextField" alignment="1" pref="191" max="32767" attributes="0"/>
- <Component id="projectLocationTextField" alignment="1" pref="191" max="32767" attributes="0"/>
- <Component id="createdFolderTextField" alignment="1" pref="191" max="32767" attributes="0"/>
- </Group>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Component id="browseButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- </Group>
- </Group>
- </DimensionLayout>
- <DimensionLayout dim="1">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="projectNameLabel" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="projectNameTextField" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="projectLocationLabel" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="projectLocationTextField" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="browseButton" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="createdFolderLabel" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="createdFolderTextField" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace pref="213" max="32767" attributes="0"/>
- </Group>
- </Group>
- </DimensionLayout>
- </Layout>
- <SubComponents>
- <Component class="javax.swing.JLabel" name="projectNameLabel">
- <Properties>
- <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
- <ComponentRef name="projectNameTextField"/>
- </Property>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/enclojure/ide/project/samples/Bundle.properties" key="RelevanceLabReplPanelVisual.projectNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- </Properties>
- <AuxValues>
- <AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
- </AuxValues>
- </Component>
- <Component class="javax.swing.JTextField" name="projectNameTextField">
- </Component>
- <Component class="javax.swing.JLabel" name="projectLocationLabel">
- <Properties>
- <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
- <ComponentRef name="projectLocationTextField"/>
- </Property>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/enclojure/ide/project/samples/Bundle.properties" key="RelevanceLabReplPanelVisual.projectLocationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- </Properties>
- <AuxValues>
- <AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
- </AuxValues>
- </Component>
- <Component class="javax.swing.JTextField" name="projectLocationTextField">
- </Component>
- <Component class="javax.swing.JButton" name="browseButton">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/enclojure/ide/project/samples/Bundle.properties" key="RelevanceLabReplPanelVisual.browseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- <Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/enclojure/ide/project/samples/Bundle.properties" key="RelevanceLabReplPanelVisual.browseButton.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="browseButtonActionPerformed"/>
- </Events>
- </Component>
- <Component class="javax.swing.JLabel" name="createdFolderLabel">
- <Properties>
- <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
- <ComponentRef name="createdFolderTextField"/>
- </Property>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/enclojure/ide/project/samples/Bundle.properties" key="RelevanceLabReplPanelVisual.createdFolderLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- </Properties>
- </Component>
- <Component class="javax.swing.JTextField" name="createdFolderTextField">
- <Properties>
- <Property name="editable" type="boolean" value="false"/>
- </Properties>
- </Component>
- </SubComponents>
-</Form>
View
260 ...e-plugin/src/main/java/org/enclojure/ide/project/samples/RelevanceLabReplPanelVisual.java
@@ -1,260 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.enclojure.ide.project.samples;
-
-import java.io.File;
-import javax.swing.JFileChooser;
-import javax.swing.JPanel;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.text.Document;
-import org.netbeans.spi.project.ui.support.ProjectChooser;
-import org.openide.WizardDescriptor;
-import org.openide.WizardValidationException;
-import org.openide.filesystems.FileUtil;
-
-public class RelevanceLabReplPanelVisual extends JPanel implements DocumentListener {
-
- public static final String PROP_PROJECT_NAME = "projectName";
- private RelevanceLabReplWizardPanel panel;
-
- public RelevanceLabReplPanelVisual(RelevanceLabReplWizardPanel panel) {
- initComponents();
- this.panel = panel;
- // Register listener on the textFields to make the automatic updates
- projectNameTextField.getDocument().addDocumentListener(this);
- projectLocationTextField.getDocument().addDocumentListener(this);
- }
-
- public String getProjectName() {
- return this.projectNameTextField.getText();
- }
-
- /** This method is called from within the constructor to
- * initialize the form.
- * WARNING: Do NOT modify this code. The content of this method is
- * always regenerated by the Form Editor.
- */
- // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
- private void initComponents() {
-
- projectNameLabel = new javax.swing.JLabel();
- projectNameTextField = new javax.swing.JTextField();
- projectLocationLabel = new javax.swing.JLabel();
- projectLocationTextField = new javax.swing.JTextField();
- browseButton = new javax.swing.JButton();
- createdFolderLabel = new javax.swing.JLabel();
- createdFolderTextField = new javax.swing.JTextField();
-
- projectNameLabel.setLabelFor(projectNameTextField);
- org.openide.awt.Mnemonics.setLocalizedText(projectNameLabel, org.openide.util.NbBundle.getMessage(RelevanceLabReplPanelVisual.class, "RelevanceLabReplPanelVisual.projectNameLabel.text")); // NOI18N
-
- projectLocationLabel.setLabelFor(projectLocationTextField);
- org.openide.awt.Mnemonics.setLocalizedText(projectLocationLabel, org.openide.util.NbBundle.getMessage(RelevanceLabReplPanelVisual.class, "RelevanceLabReplPanelVisual.projectLocationLabel.text")); // NOI18N
-
- org.openide.awt.Mnemonics.setLocalizedText(browseButton, org.openide.util.NbBundle.getMessage(RelevanceLabReplPanelVisual.class, "RelevanceLabReplPanelVisual.browseButton.text")); // NOI18N
- browseButton.setActionCommand(org.openide.util.NbBundle.getMessage(RelevanceLabReplPanelVisual.class, "RelevanceLabReplPanelVisual.browseButton.actionCommand")); // NOI18N
- browseButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- browseButtonActionPerformed(evt);
- }
- });
-
- createdFolderLabel.setLabelFor(createdFolderTextField);
- org.openide.awt.Mnemonics.setLocalizedText(createdFolderLabel, org.openide.util.NbBundle.getMessage(RelevanceLabReplPanelVisual.class, "RelevanceLabReplPanelVisual.createdFolderLabel.text")); // NOI18N
-
- createdFolderTextField.setEditable(false);
-
- org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
- this.setLayout(layout);
- layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(projectNameLabel)
- .add(projectLocationLabel)
- .add(createdFolderLabel))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, projectNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, projectLocationTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, createdFolderTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(browseButton)
- .addContainerGap())
- );
- layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(projectNameLabel)
- .add(projectNameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(projectLocationLabel)
- .add(projectLocationTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(browseButton))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(createdFolderLabel)
- .add(createdFolderTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addContainerGap(213, Short.MAX_VALUE))
- );
- }// </editor-fold>//GEN-END:initComponents
-
- private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed
- String command = evt.getActionCommand();
- if ("BROWSE".equals(command)) {
- JFileChooser chooser = new JFileChooser();
- FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
- chooser.setDialogTitle("Select Project Location");
- chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
- String path = this.projectLocationTextField.getText();
- if (path.length() > 0) {
- File f = new File(path);
- if (f.exists()) {
- chooser.setSelectedFile(f);
- }
- }
- if (JFileChooser.APPROVE_OPTION == chooser.showOpenDialog(this)) {
- File projectDir = chooser.getSelectedFile();
- projectLocationTextField.setText(FileUtil.normalizeFile(projectDir).getAbsolutePath());
- }
- panel.fireChangeEvent();
- }
-
- }//GEN-LAST:event_browseButtonActionPerformed
- // Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JButton browseButton;
- private javax.swing.JLabel createdFolderLabel;
- private javax.swing.JTextField createdFolderTextField;
- private javax.swing.JLabel projectLocationLabel;
- private javax.swing.JTextField projectLocationTextField;
- private javax.swing.JLabel projectNameLabel;
- private javax.swing.JTextField projectNameTextField;
- // End of variables declaration//GEN-END:variables
-
- @Override
- public void addNotify() {
- super.addNotify();
- //same problem as in 31086, initial focus on Cancel button
- projectNameTextField.requestFocus();
- }
-
- boolean valid(WizardDescriptor wizardDescriptor) {
-
- if (projectNameTextField.getText().length() == 0) {
- // TODO if using org.openide.dialogs >= 7.8, can use WizardDescriptor.PROP_ERROR_MESSAGE:
- wizardDescriptor.putProperty("WizardPanel_errorMessage",
- "Project Name is not a valid folder name.");
- return false; // Display name not specified
- }
- File f = FileUtil.normalizeFile(new File(projectLocationTextField.getText()).getAbsoluteFile());
- if (!f.isDirectory()) {
- String message = "Project Folder is not a valid path.";
- wizardDescriptor.putProperty("WizardPanel_errorMessage", message);
- return false;
- }
- final File destFolder = FileUtil.normalizeFile(new File(createdFolderTextField.getText()).getAbsoluteFile());
-
- File projLoc = destFolder;
- while (projLoc != null && !projLoc.exists()) {
- projLoc = projLoc.getParentFile();
- }
- if (projLoc == null || !projLoc.canWrite()) {
- wizardDescriptor.putProperty("WizardPanel_errorMessage",
- "Project Folder cannot be created.");
- return false;
- }
-
- if (FileUtil.toFileObject(projLoc) == null) {
- String message = "Project Folder is not a valid path.";
- wizardDescriptor.putProperty("WizardPanel_errorMessage", message);
- return false;
- }
-
- File[] kids = destFolder.listFiles();
- if (destFolder.exists() && kids != null && kids.length > 0) {
- // Folder exists and is not empty
- wizardDescriptor.putProperty("WizardPanel_errorMessage",
- "Project Folder already exists and is not empty.");
- return false;
- }
- wizardDescriptor.putProperty("WizardPanel_errorMessage", "");
- return true;
- }
-
- void store(WizardDescriptor d) {
- String name = projectNameTextField.getText().trim();
- String folder = createdFolderTextField.getText().trim();
-
- d.putProperty("projdir", new File(folder));
- d.putProperty("name", name);
- }
-
- void read(WizardDescriptor settings) {
- File projectLocation = (File) settings.getProperty("projdir");
- if (projectLocation == null || projectLocation.getParentFile() == null || !projectLocation.getParentFile().isDirectory()) {
- projectLocation = ProjectChooser.getProjectsFolder();
- } else {
- projectLocation = projectLocation.getParentFile();
- }
- this.projectLocationTextField.setText(projectLocation.getAbsolutePath());
-
- String projectName = (String) settings.getProperty("name");
- if (projectName == null) {
- projectName = "RelevanceLabRepl";
- }
- this.projectNameTextField.setText(projectName);
- this.projectNameTextField.selectAll();
- }
-
- void validate(WizardDescriptor d) throws WizardValidationException {
- // nothing to validate
- }
-
- // Implementation of DocumentListener --------------------------------------
- public void changedUpdate(DocumentEvent e) {
- updateTexts(e);
- if (this.projectNameTextField.getDocument() == e.getDocument()) {
- firePropertyChange(PROP_PROJECT_NAME, null, this.projectNameTextField.getText());
- }
- }
-
- public void insertUpdate(DocumentEvent e) {
- updateTexts(e);
- if (this.projectNameTextField.getDocument() == e.getDocument()) {
- firePropertyChange(PROP_PROJECT_NAME, null, this.projectNameTextField.getText());
- }
- }
-
- public void removeUpdate(DocumentEvent e) {
- updateTexts(e);
- if (this.projectNameTextField.getDocument() == e.getDocument()) {
- firePropertyChange(PROP_PROJECT_NAME, null, this.projectNameTextField.getText());
- }
- }
-
- /** Handles changes in the Project name and project directory, */
- private void updateTexts(DocumentEvent e) {
-
- Document doc = e.getDocument();
-
- if (doc == projectNameTextField.getDocument() || doc == projectLocationTextField.getDocument()) {
- // Change in the project name
-
- String projectName = projectNameTextField.getText();
- String projectFolder = projectLocationTextField.getText();
-
- //if (projectFolder.trim().length() == 0 || projectFolder.equals(oldName)) {
- createdFolderTextField.setText(projectFolder + File.separatorChar + projectName);
- //}
-
- }
- panel.fireChangeEvent(); // Notify that the panel changed
- }
-}
View
220 ...lugin/src/main/java/org/enclojure/ide/project/samples/RelevanceLabReplWizardIterator.java
@@ -1,220 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.enclojure.ide.project.samples;
-
-import java.awt.Component;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.text.MessageFormat;
-import java.util.Enumeration;
-import java.util.LinkedHashSet;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import javax.swing.JComponent;
-import javax.swing.event.ChangeListener;
-import org.netbeans.api.project.ProjectManager;
-import org.netbeans.spi.project.ui.support.ProjectChooser;
-import org.netbeans.spi.project.ui.templates.support.Templates;
-import org.openide.WizardDescriptor;
-import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileUtil;
-import org.openide.util.Exceptions;
-import org.openide.util.NbBundle;
-import org.openide.xml.XMLUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
-public class RelevanceLabReplWizardIterator implements WizardDescriptor./*Progress*/InstantiatingIterator {
-
- private int index;
- private WizardDescriptor.Panel[] panels;
- private WizardDescriptor wiz;
-
- public RelevanceLabReplWizardIterator() {
- }
-
- public static RelevanceLabReplWizardIterator createIterator() {
- return new RelevanceLabReplWizardIterator();
- }
-
- private WizardDescriptor.Panel[] createPanels() {
- return new WizardDescriptor.Panel[]{
- new RelevanceLabReplWizardPanel(),};
- }
-
- private String[] createSteps() {
- return new String[]{
- NbBundle.getMessage(RelevanceLabReplWizardIterator.class, "LBL_CreateProjectStep")
- };
- }
-
- public Set/*<FileObject>*/ instantiate(/*ProgressHandle handle*/) throws IOException {
- Set<FileObject> resultSet = new LinkedHashSet<FileObject>();
- File dirF = FileUtil.normalizeFile((File) wiz.getProperty("projdir"));
- dirF.mkdirs();
-
- FileObject template = Templates.getTemplate(wiz);
- FileObject dir = FileUtil.toFileObject(dirF);
- unZipFile(template.getInputStream(), dir);
-
- // Always open top dir as a project:
- resultSet.add(dir);
- // Look for nested projects to open as well:
- Enumeration<? extends FileObject> e = dir.getFolders(true);
- while (e.hasMoreElements()) {
- FileObject subfolder = e.nextElement();
- if (ProjectManager.getDefault().isProject(subfolder)) {
- resultSet.add(subfolder);
- }
- }
-
- File parent = dirF.getParentFile();
- if (parent != null && parent.exists()) {
- ProjectChooser.setProjectsFolder(parent);
- }
-
- return resultSet;
- }
-
- public void initialize(WizardDescriptor wiz) {
- this.wiz = wiz;
- index = 0;
- panels = createPanels();
- // Make sure list of steps is accurate.
- String[] steps = createSteps();
- for (int i = 0; i < panels.length; i++) {
- Component c = panels[i].getComponent();
- if (steps[i] == null) {
- // Default step name to component name of panel.
- // Mainly useful for getting the name of the target
- // chooser to appear in the list of steps.
- steps[i] = c.getName();
- }
- if (c instanceof JComponent) { // assume Swing components
- JComponent jc = (JComponent) c;
- // Step #.
- // TODO if using org.openide.dialogs >= 7.8, can use WizardDescriptor.PROP_*:
- jc.putClientProperty("WizardPanel_contentSelectedIndex", new Integer(i));
- // Step name (actually the whole list for reference).
- jc.putClientProperty("WizardPanel_contentData", steps);
- }
- }
- }
-
- public void uninitialize(WizardDescriptor wiz) {
- this.wiz.putProperty("projdir", null);
- this.wiz.putProperty("name", null);
- this.wiz = null;
- panels = null;
- }
-
- public String name() {
- return MessageFormat.format("{0} of {1}",
- new Object[]{new Integer(index + 1), new Integer(panels.length)});
- }
-
- public boolean hasNext() {
- return index < panels.length - 1;
- }
-
- public boolean hasPrevious() {
- return index > 0;
- }
-
- public void nextPanel() {
- if (!hasNext()) {
- throw new NoSuchElementException();
- }
- index++;
- }
-
- public void previousPanel() {
- if (!hasPrevious()) {
- throw new NoSuchElementException();
- }
- index--;
- }
-
- public WizardDescriptor.Panel current() {
- return panels[index];
- }
-
- // If nothing unusual changes in the middle of the wizard, simply:
- public final void addChangeListener(ChangeListener l) {
- }
-
- public final void removeChangeListener(ChangeListener l) {
- }
-
- private static void unZipFile(InputStream source, FileObject projectRoot) throws IOException {
- try {
- ZipInputStream str = new ZipInputStream(source);
- ZipEntry entry;
- while ((entry = str.getNextEntry()) != null) {
- if (entry.isDirectory()) {
- FileUtil.createFolder(projectRoot, entry.getName());
- } else {
- FileObject fo = FileUtil.createData(projectRoot, entry.getName());
- if ("nbproject/project.xml".equals(entry.getName())) {
- // Special handling for setting name of Ant-based projects; customize as needed:
- filterProjectXML(fo, str, projectRoot.getName());
- } else {
- writeFile(str, fo);
- }
- }
- }
- } finally {
- source.close();
- }
- }
-
- private static void writeFile(ZipInputStream str, FileObject fo) throws IOException {
- OutputStream out = fo.getOutputStream();
- try {
- FileUtil.copy(str, out);
- } finally {
- out.close();
- }
- }
-
- private static void filterProjectXML(FileObject fo, ZipInputStream str, String name) throws IOException {
- try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- FileUtil.copy(str, baos);
- Document doc = XMLUtil.parse(new InputSource(new ByteArrayInputStream(baos.toByteArray())), false, false, null, null);
- NodeList nl = doc.getDocumentElement().getElementsByTagName("name");
- if (nl != null) {
- for (int i = 0; i < nl.getLength(); i++) {
- Element el = (Element) nl.item(i);
- if (el.getParentNode() != null && "data".equals(el.getParentNode().getNodeName())) {
- NodeList nl2 = el.getChildNodes();
- if (nl2.getLength() > 0) {
- nl2.item(0).setNodeValue(name);
- }
- break;
- }
- }
- }
- OutputStream out = fo.getOutputStream();
- try {
- XMLUtil.write(doc, out, "UTF-8");
- } finally {
- out.close();
- }
- } catch (Exception ex) {
- Exceptions.printStackTrace(ex);
- writeFile(str, fo);
- }
-
- }
-}
View
88 ...e-plugin/src/main/java/org/enclojure/ide/project/samples/RelevanceLabReplWizardPanel.java
@@ -1,88 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.enclojure.ide.project.samples;
-
-import java.awt.Component;
-import java.util.HashSet;
-import java.util.Set;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import org.openide.WizardDescriptor;
-import org.openide.WizardValidationException;
-import org.openide.util.HelpCtx;
-import org.openide.util.NbBundle;
-
-/**
- * Panel just asking for basic info.
- */
-public class RelevanceLabReplWizardPanel implements WizardDescriptor.Panel,
- WizardDescriptor.ValidatingPanel, WizardDescriptor.FinishablePanel {
-
- private WizardDescriptor wizardDescriptor;
- private RelevanceLabReplPanelVisual component;
-
- public RelevanceLabReplWizardPanel() {
- }
-
- public Component getComponent() {
- if (component == null) {
- component = new RelevanceLabReplPanelVisual(this);
- component.setName(NbBundle.getMessage(RelevanceLabReplWizardPanel.class, "LBL_CreateProjectStep"));
- }
- return component;
- }
-
- public HelpCtx getHelp() {
- return new HelpCtx(RelevanceLabReplWizardPanel.class);
- }
-
- public boolean isValid() {
- getComponent();
- return component.valid(wizardDescriptor);
- }
- private final Set<ChangeListener> listeners = new HashSet<ChangeListener>(1); // or can use ChangeSupport in NB 6.0
-
- public final void addChangeListener(ChangeListener l) {
- synchronized (listeners) {
- listeners.add(l);
- }
- }
-
- public final void removeChangeListener(ChangeListener l) {
- synchronized (listeners) {
- listeners.remove(l);
- }
- }
-
- protected final void fireChangeEvent() {
- Set<ChangeListener> ls;
- synchronized (listeners) {
- ls = new HashSet<ChangeListener>(listeners);
- }
- ChangeEvent ev = new ChangeEvent(this);
- for (ChangeListener l : ls) {
- l.stateChanged(ev);
- }
- }
-
- public void readSettings(Object settings) {
- wizardDescriptor = (WizardDescriptor) settings;
- component.read(wizardDescriptor);
- }
-
- public void storeSettings(Object settings) {
- WizardDescriptor d = (WizardDescriptor) settings;
- component.store(d);
- }
-
- public boolean isFinishPanel() {
- return true;
- }
-
- public void validate() throws WizardValidationException {
- getComponent();
- component.validate(wizardDescriptor);
- }
-}
View
BIN ...urces/org/enclojure/ide/project/samples/ClojureProjectTemplate/ClojureProjectTemplate.zip