[izpack-changes] r1475 - in izpack-src/trunk: bin/langpacks/installer src/doc-ng/XHTML src/lib/com/izforge/izpack/panels

[noreply at berlios.de]

Author: bartzkau
Date: 2006-07-04 13:16:10 +0200 (Tue, 04 Jul 2006)
New Revision: 1475

Modified:
   izpack-src/trunk/bin/langpacks/installer/deu.xml
   izpack-src/trunk/bin/langpacks/installer/eng.xml
   izpack-src/trunk/src/doc-ng/XHTML/node5.html
   izpack-src/trunk/src/lib/com/izforge/izpack/panels/PathInputPanel.java
Log:
extendedIntro for JDKPathPanel added; missing modifier in
docu.


Modified: izpack-src/trunk/bin/langpacks/installer/deu.xml
===================================================================
--- izpack-src/trunk/bin/langpacks/installer/deu.xml	2006-07-04 09:31:24 UTC (rev 1474)
+++ izpack-src/trunk/bin/langpacks/installer/deu.xml	2006-07-04 11:16:10 UTC (rev 1475)
@@ -83,6 +83,7 @@
     <str id="TargetPanel.createdir"
          txt="Das folgende Verzeichnis wird erstellt:" />
 
+    <str id="JDKPathPanel.extendedIntro" txt="Für den Betrieb des Produktes wird ein JDK zwischen Version ${JDKPathPanel.minVersion} und ${JDKPathPanel.maxVersion} benötigt. Eine Java-Runtime-Umgebung (JRE) ist nicht ausreichend."/>
     <str id="JDKPathPanel.intro" txt="Für den Betrieb des Produktes wird ein JDK benötigt. Eine Java-Runtime-Umgebung (JRE) ist nicht ausreichend."/>
     <str id="JDKPathPanel.info" txt="Pfad des JDK-Verzeichnisses:"/>
     <str id="JDKPathPanel.badVersion1" txt="Der gewählte JDK hat die falsche Version (vorhanden: "/>

Modified: izpack-src/trunk/bin/langpacks/installer/eng.xml
===================================================================
--- izpack-src/trunk/bin/langpacks/installer/eng.xml	2006-07-04 09:31:24 UTC (rev 1474)
+++ izpack-src/trunk/bin/langpacks/installer/eng.xml	2006-07-04 11:16:10 UTC (rev 1475)
@@ -83,6 +83,7 @@
     <str id="TargetPanel.notwritable" 
          txt="This directory can not be written! Please choose another directory!"/>
     
+    <str id="JDKPathPanel.extendedIntro" txt="The installed application needs a JDK between version ${JDKPathPanel.minVersion} and ${JDKPathPanel.maxVersion}. A java runtime environment (JRE) will be not sufficient."/>
     <str id="JDKPathPanel.intro" txt="The installed application needs a JDK. A java runtime environment (JRE) will be not sufficient."/>
     <str id="JDKPathPanel.info" txt="Select the JDK path:"/>
     <str id="JDKPathPanel.badVersion1" txt="The chosen JDK has the wrong version (available: "/>

Modified: izpack-src/trunk/src/doc-ng/XHTML/node5.html
===================================================================
--- izpack-src/trunk/src/doc-ng/XHTML/node5.html	2006-07-04 09:31:24 UTC (rev 1474)
+++ izpack-src/trunk/src/doc-ng/XHTML/node5.html	2006-07-04 11:16:10 UTC (rev 1475)
@@ -403,6 +403,7 @@
   &lt;modifier key="useButtonIcons" value="no"/&gt;
   &lt;modifier key="useLabelIcons" value="no"/&gt;
   &lt;modifier key="labelGap" value="2"/&gt;    
+  &lt;modifier key="layoutAnchor" value="NORTHWEST"/&gt;    
   &lt;modifier key="useHeadingPanel" value="yes"/&gt;
   &lt;modifier key="headingLineCount" value="1"/&gt;
   &lt;modifier key="headingFontSize" value="1.5"/&gt;
@@ -464,6 +465,7 @@
 &lt;guiprefs width="640" height="480" resizable="no"&gt;
   &lt;modifier key="useButtonIcons" value="no"/&gt;
   &lt;modifier key="useLabelIcons" value="no"/&gt;
+  &lt;modifier key="layoutAnchor" value="NORTHWEST"/&gt;    
   &lt;modifier key="labelGap" value="2"/&gt;    
   &lt;modifier key="useHeadingPanel" value="yes"/&gt;
   &lt;modifier key="headingLineCount" value="1"/&gt;

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/PathInputPanel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/PathInputPanel.java	2006-07-04 09:31:24 UTC (rev 1474)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/PathInputPanel.java	2006-07-04 11:16:10 UTC (rev 1475)
@@ -92,9 +92,19 @@
         // Customize the default GridBagConstraints.
         GridBagConstraints gbConstraint = getDefaultGridBagConstraints();
         gbConstraint.gridwidth = GridBagConstraints.REMAINDER;
+        if(getAnchor() == GridBagConstraints.NORTH || getAnchor() == GridBagConstraints.NORTHWEST)
+            gbConstraint.weightx = 1.0;
+        else
+            gbConstraint.weightx = 0.0;
         this.setDefaultGridBagConstraints(gbConstraint);
-        String introText = getI18nStringForClass("intro", "PathInputPanel");
-        if (introText == null || introText.startsWith("PathInputPanel.intro")) introText = "";
+        String introText = getI18nStringForClass("extendedIntro", "PathInputPanel");
+        if (introText == null || introText.endsWith("extendedIntro")
+                || introText.indexOf('$') > -1 )
+        {
+            introText = getI18nStringForClass("intro", "PathInputPanel");
+            if (introText == null || introText.endsWith("intro"))
+                introText = "";
+        }
         // Intro
         // Create and customize constraint for it.
         // row 0 column 0