Menu
▾
▴
[Exist-commits] SF.net SVN: exist:[17434] trunk/eXist
|
From: <di...@us...> - 2012-10-29 09:21:51
|
Revision: 17434
http://sourceforge.net/p/exist/code/17434
Author: dizzzz
Date: 2012-10-29 09:21:48 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
[bugfix] make trunk build again; please use javax.swing.GroupLayout not org.jdesktop.layout.GroupLayout (part 2)
Modified Paths:
--------------
trunk/eXist/nbproject/project.properties
trunk/eXist/src/org/exist/client/security/UserManagerDialog.form
trunk/eXist/src/org/exist/client/security/UserManagerDialog.java
Modified: trunk/eXist/nbproject/project.properties
===================================================================
--- trunk/eXist/nbproject/project.properties 2012-10-29 09:12:07 UTC (rev 17433)
+++ trunk/eXist/nbproject/project.properties 2012-10-29 09:21:48 UTC (rev 17434)
@@ -311,8 +311,7 @@
${file.reference.exquery-xquery-1.0-SNAPSHOT.jar}:\
${file.reference.exquery-xquery3-1.0-SNAPSHOT.jar}:\
${file.reference.exquery-restxq-1.0-SNAPSHOT.jar}:\
- ${file.reference.exquery-restxq-api-1.0-SNAPSHOT.jar}:\
- ${libs.swing-layout.classpath}
+ ${file.reference.exquery-restxq-api-1.0-SNAPSHOT.jar}
file.reference.samples-src=samples/src
build.classes.dir=${build.dir}/classes
eXist-1.32.dir=${file.reference.samples-src}
Modified: trunk/eXist/src/org/exist/client/security/UserManagerDialog.form
===================================================================
--- trunk/eXist/src/org/exist/client/security/UserManagerDialog.form 2012-10-29 09:12:07 UTC (rev 17433)
+++ trunk/eXist/src/org/exist/client/security/UserManagerDialog.form 2012-10-29 09:21:48 UTC (rev 17434)
@@ -89,7 +89,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="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"/>
@@ -99,7 +99,7 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
- <EmptySpace pref="211" max="32767" attributes="0"/>
+ <EmptySpace pref="250" max="32767" attributes="0"/>
<Component id="btnClose" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="btnCreate" min="-2" max="-2" attributes="0"/>
@@ -118,7 +118,7 @@
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
- <EmptySpace min="0" pref="290" max="32767" attributes="0"/>
+ <EmptySpace min="0" pref="291" max="32767" attributes="0"/>
<Component id="jSeparator1" min="-2" pref="10" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
@@ -162,14 +162,13 @@
<SubComponents>
<Component class="javax.swing.JTable" name="tblUsers">
<Properties>
+ <Property name="autoCreateRowSorter" type="boolean" value="true"/>
<Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="getUsersTableModel()" type="code"/>
</Property>
- <Property name="autoCreateRowSorter" type="boolean" value="true"/>
<Property name="componentPopupMenu" type="javax.swing.JPopupMenu" editor="org.netbeans.modules.form.ComponentChooserEditor">
<ComponentRef name="pmUsers"/>
</Property>
- <Property name="showGrid" type="boolean" value="true"/>
</Properties>
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="tblUsersMouseClicked"/>
@@ -196,14 +195,13 @@
<SubComponents>
<Component class="javax.swing.JTable" name="tblGroups">
<Properties>
+ <Property name="autoCreateRowSorter" type="boolean" value="true"/>
<Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="getGroupsTableModel()" type="code"/>
</Property>
- <Property name="autoCreateRowSorter" type="boolean" value="true"/>
<Property name="componentPopupMenu" type="javax.swing.JPopupMenu" editor="org.netbeans.modules.form.ComponentChooserEditor">
<ComponentRef name="pmGroups"/>
</Property>
- <Property name="showGrid" type="boolean" value="true"/>
</Properties>
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="tblGroupsMouseClicked"/>
Modified: trunk/eXist/src/org/exist/client/security/UserManagerDialog.java
===================================================================
--- trunk/eXist/src/org/exist/client/security/UserManagerDialog.java 2012-10-29 09:12:07 UTC (rev 17433)
+++ trunk/eXist/src/org/exist/client/security/UserManagerDialog.java 2012-10-29 09:21:48 UTC (rev 17434)
@@ -200,10 +200,9 @@
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle("User Manager");
- tblUsers.setModel(getUsersTableModel());
tblUsers.setAutoCreateRowSorter(true);
+ tblUsers.setModel(getUsersTableModel());
tblUsers.setComponentPopupMenu(pmUsers);
- tblUsers.setShowGrid(true);
tblUsers.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) {
tblUsersMouseClicked(evt);
@@ -213,10 +212,9 @@
tpUserManager.addTab("Users", spUsers);
- tblGroups.setModel(getGroupsTableModel());
tblGroups.setAutoCreateRowSorter(true);
+ tblGroups.setModel(getGroupsTableModel());
tblGroups.setComponentPopupMenu(pmGroups);
- tblGroups.setShowGrid(true);
tblGroups.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) {
tblGroupsMouseClicked(evt);
@@ -241,38 +239,38 @@
}
});
- 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()
- .addContainerGap(211, Short.MAX_VALUE)
- .add(btnClose)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(btnCreate)
- .add(20, 20, 20))
- .add(layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addContainerGap(250, Short.MAX_VALUE)
+ .addComponent(btnClose)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(btnCreate)
+ .addGap(20, 20, 20))
+ .addGroup(layout.createSequentialGroup()
.addContainerGap()
- .add(jSeparator1)
+ .addComponent(jSeparator1)
.addContainerGap())
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tpUserManager, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(tpUserManager, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE))
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
- .add(0, 290, Short.MAX_VALUE)
- .add(jSeparator1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(btnCreate)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
- .add(btnClose)
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addGap(0, 291, Short.MAX_VALUE)
+ .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(btnCreate)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addComponent(btnClose)
.addContainerGap())))
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(tpUserManager, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 291, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(0, 50, Short.MAX_VALUE)))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(tpUserManager, javax.swing.GroupLayout.PREFERRED_SIZE, 291, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(0, 50, Short.MAX_VALUE)))
);
tpUserManager.getAccessibleContext().setAccessibleName("Users");
|