Changeset 15311 for release-kits/shared

Timestamp:

2008-04-30T17:00:38+12:00 (16 years ago)

Author:

oranfry

Message:

deleting unneeded compiled classes

Location:

release-kits/shared/ant-installer

Files:

• artifacts/prepare (deleted)
• classes (deleted)
• demo/artifacts/demo-installer.jar (deleted)
• demo/artifacts/installpack.zip (modified) ( previous)
• demo/classes (deleted)
• lib/ant-installer-ext.jar (modified) ( previous)
• lib/ant-installer.jar (modified) ( previous)
• src/org/tp23/antinstaller/input/TargetInput.java (modified) (4 diffs)
• src/org/tp23/antinstaller/page/SimpleInputPage.java (modified) (1 diff)
• src/org/tp23/antinstaller/renderer/swing/AIShortLabel.java (added)
• src/org/tp23/antinstaller/renderer/swing/TargetInputRenderer.java (modified) (3 diffs)
• src/org/tp23/antinstaller/selfextract/SelfExtractor.java (modified) (1 diff)

release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/TargetInput.java

@@ -62 +62 @@
     //targets are ordered
     private int idx;
+    private String diskRequirement;
 
     private static int globalIdx = 1;
@@ -90 +91 @@
     }
 
+    public void setDiskRequirement(String diskRequirement) {
+        this.diskRequirement = diskRequirement;
+    }
+
     public String getForce() {
         return force;
@@ -98 +103 @@
     }
 
-
     public String getStrict() {
         return strict;
@@ -113 +117 @@
     public void setOsSpecific(String osSpecific) {
         this.osSpecific = osSpecific;
+    }
+
+    public String getDiskRequirement() {
+        return diskRequirement;
     }
 

release-kits/shared/ant-installer/src/org/tp23/antinstaller/page/SimpleInputPage.java

@@ -25 +25 @@
 
     private String ifTarget;
-    private String ifProperty;
+    private String ifProperty;
     private boolean overflow;
 

release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/TargetInputRenderer.java

@@ -38 +38 @@
 
     protected AILabel fieldLabel = new AILabel();
+    protected AIShortLabel sizeLabel = new AIShortLabel();
     protected JCheckBox targetCheckBox = new JCheckBox();
+
 
     public TargetInputRenderer() {
@@ -80 +82 @@
     private void jbInit() throws Exception {
         fieldLabel.setText(outputField.getDisplayText());
+        sizeLabel.setText(outputField.getDiskRequirement());
+        sizeLabel.setMinimumSize( new Dimension( 80, 0 ) );
         targetCheckBox.setSelected(InputField.isTrue(outputField.getDefaultValue()));
         if(InputField.isTrue(outputField.getForce())){
@@ -94 +98 @@
     public int addSelf(JPanel content,GBCF cf,  int row,boolean overflow) {
 
-        JLabel h = new JLabel("help");
-        h.setToolTipText(outputField.getExplanatoryText());
 
-        JPanel p, pp;
+        JLabel hlp = new JLabel("help");
+        hlp.setToolTipText(outputField.getExplanatoryText());
 
-        pp = new JPanel(new FlowLayout(FlowLayout.LEFT));
-        pp.add( targetCheckBox );
-        pp.add( h );
+        JPanel p;
 
-        p = new JPanel(new BorderLayout());
-        p.add( fieldLabel, BorderLayout.WEST );
-        p.add( pp, BorderLayout.CENTER );
+        p = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        p.add( fieldLabel );
+        p.add( sizeLabel );
+        p.add( targetCheckBox );
+        p.add( hlp );
         content.add(p);
 
-        p = new JPanel();
-        p.setMinimumSize( new Dimension(0,1) );
-        content.add(p);
-
-
-        
-        //if(overflow){
-        //  targetCheckBox.setOverflow(SizeConstants.OVERFLOW_FIELD_SIZE);
-        //}
         return ++row;
     }

release-kits/shared/ant-installer/src/org/tp23/antinstaller/selfextract/SelfExtractor.java

@@ -125 +125 @@
         File curDir = new File("t.tmp").getParentFile();
         extractDir = new File(curDir, "antinstall");
-        int idx = 0;
-        while (extractDir.exists()) {
-            extractDir = new File(curDir, "antinstall" + (idx++));
-    }
+        for ( int i=0; extractDir.exists(); i++) {
+            extractDir = new File(curDir, "antinstall" + i);
+        }
         extractDir.mkdirs();
         extractDir.deleteOnExit();