summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form27
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java19
-rw-r--r--idrop-swing/src/main/resources/idrop.properties4
-rw-r--r--idrop-web/web-app/WEB-INF/applicationContext.xml2
4 files changed, 36 insertions, 16 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form
index 7f7ee04..6833fdd 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form
@@ -20,7 +20,7 @@
<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"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,90,0,0,3,-15"/>
+ <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,-95,0,0,3,-4"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -35,7 +35,7 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="1009" max="32767" attributes="0"/>
+ <EmptySpace min="0" pref="1020" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
@@ -353,18 +353,33 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="pnlConfigSynchListing">
+ <Properties>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[23, 100]"/>
+ </Property>
+ </Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
- <Property name="columns" type="int" value="0"/>
- <Property name="rows" type="int" value="1"/>
- </Layout>
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JScrollPane" name="scrollSynchTable">
+ <Properties>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[23, 100]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 100]"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+ <BorderConstraints direction="Center"/>
+ </Constraint>
+ </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
</Container>
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java
index 8a9648f..a1a30d8 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java
@@ -61,7 +61,7 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
* always regenerated by the Form Editor.
*/
@SuppressWarnings("unchecked")
- // <editor-fold defaultstate="collapsed" desc="Generated Code">
+ // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
@@ -125,7 +125,7 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
pnlTop.setLayout(pnlTopLayout);
pnlTopLayout.setHorizontalGroup(
pnlTopLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 1009, Short.MAX_VALUE)
+ .add(0, 1020, Short.MAX_VALUE)
);
pnlTopLayout.setVerticalGroup(
pnlTopLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -298,8 +298,12 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
});
pnlConfigSynch.setLayout(new java.awt.BorderLayout());
- pnlConfigSynchListing.setLayout(new java.awt.GridLayout(1, 0));
- pnlConfigSynchListing.add(scrollSynchTable);
+ pnlConfigSynchListing.setMinimumSize(new java.awt.Dimension(23, 100));
+ pnlConfigSynchListing.setLayout(new java.awt.BorderLayout());
+
+ scrollSynchTable.setMinimumSize(new java.awt.Dimension(23, 100));
+ scrollSynchTable.setPreferredSize(new java.awt.Dimension(100, 100));
+ pnlConfigSynchListing.add(scrollSynchTable, java.awt.BorderLayout.CENTER);
pnlConfigSynch.add(pnlConfigSynchListing, java.awt.BorderLayout.CENTER);
@@ -497,7 +501,7 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
getContentPane().add(pnlBottom, java.awt.BorderLayout.SOUTH);
pack();
- }// </editor-fold>
+ }// </editor-fold>//GEN-END:initComponents
private void btnOKActionPerformed(java.awt.event.ActionEvent evt) {
this.dispose();
@@ -546,6 +550,7 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
jTableSynch.getSelectionModel().addListSelectionListener(new SynchListSelectionHandler(thisPanel));
scrollSynchTable.setViewportView(jTableSynch);
scrollSynchTable.validate();
+ pnlConfigSynchListing.validate();
} else {
SynchConfigTableModel synchConfigTableModel = (SynchConfigTableModel) jTableSynch.getModel();
synchConfigTableModel.setSynchronizations(synchronizations);
@@ -881,7 +886,7 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
protected JTable getSynchTable() {
return jTableSynch;
}
- // Variables declaration - do not modify
+ // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton btnChangePassword;
private javax.swing.JButton btnChooseIrodsSynch;
private javax.swing.JButton btnChooseLocalSynch;
@@ -934,7 +939,7 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
private javax.swing.JTextField txtIrodsPath;
private javax.swing.JTextField txtLocalPath;
private javax.swing.JTextField txtSynchName;
- // End of variables declaration
+ // End of variables declaration//GEN-END:variables
private void initWithConfigData() {
IdropConfig idropConfig = idropCore.getIdropConfig();
diff --git a/idrop-swing/src/main/resources/idrop.properties b/idrop-swing/src/main/resources/idrop.properties
index 1af75d4..44ebb89 100644
--- a/idrop-swing/src/main/resources/idrop.properties
+++ b/idrop-swing/src/main/resources/idrop.properties
@@ -1,6 +1,6 @@
policy.aware=false
-login.preset=false
-force.mode=false
+login.preset=true
+force.mode=true
force.no.synch=false
advanced.view=true
show.startup=true
diff --git a/idrop-web/web-app/WEB-INF/applicationContext.xml b/idrop-web/web-app/WEB-INF/applicationContext.xml
index 1a415bf..babfee2 100644
--- a/idrop-web/web-app/WEB-INF/applicationContext.xml
+++ b/idrop-web/web-app/WEB-INF/applicationContext.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-<import resource="classpath:**/resources.xml" />
+<!--<import resource="classpath:**/resources.xml" /> -->
<bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean">
<description>Grails application factory bean</description>