From dlanglais@users.nuiton.org Tue Jan 26 14:40:00 2010
From: dlanglais@users.nuiton.org
To: mapstoragemanager-commits@list.nuiton.org
Subject: [Mapstoragemanager-commits] r14 - in trunk/src/main:
	java/org/nuiton/mapstoragemanager/ui	java/org/nuiton/mapstoragemanager/ui/gui
 resources/i18n
Date: Tue, 26 Jan 2010 14:39:59 +0100
Message-ID: <20100126133959.E9B3015D60@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3328981031470172940=="

--===============3328981031470172940==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: dlanglais
Date: 2010-01-26 14:39:59 +0100 (Tue, 26 Jan 2010)
New Revision: 14

Removed:
   trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx
   trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx
   trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx
   trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx
Modified:
   trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx
   trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.=
java
   trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties
   trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties
Log:
Tony Chemit n'avait pas commit, so j'ai refait les modifs (en plus ?\195?\167=
a m'a permit de mieux comprendre ce que l'on a fait).
J'ai supprim?\195?\169 les fichiers .jaxx "useless".

Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx	2010-01-2=
6 08:59:42 UTC (rev 13)
+++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx	2010-01-2=
6 13:39:59 UTC (rev 14)
@@ -5,22 +5,81 @@
 	 maximumSize=3D"{new Dimension(constants.MAXIMUM_SIZE_WIDTH,constants.MAXIM=
UM_SIZE_HEIGHT)}"
 	 resizable=3D'true'>
=20
+	<script><![CDATA[
+import org.nuiton.mapstoragemanager.ui.gui.ApplicationConstants;
+import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine;
+ApplicationEngine engine =3D new ApplicationEngine();
+ApplicationConstants constants =3D new ApplicationConstants();
+]]>
+    </script>
+
 <!-- definition of style -->
 <style source=3D'MainUI.css'/>
=20
 <!-- include java files for treatment -->
-<gui.ApplicationConstants id=3D'constants'/>
-<gui.ApplicationEngine id=3D'engine'/>
 =09
 <!-- content -->
 =09
-	<menu/>
+	<JMenuBar>
+		<JMenu text=3D"File">
+			<JMenuItem text=3D"Connect" onActionPerformed=3D'engine.doSomething()'/>
+			<JMenuItem text=3D"Disconnect" onActionPerformed=3D'engine.doSomething()'=
/>
+			<JSeparator/>
+			<JMenuItem text=3D"Quit" onActionPerformed=3D'engine.close()'/>
+		</JMenu>
+		<JMenu text=3D"Edit">
+			<JMenuItem text=3D"Preferences" onActionPerformed=3D'engine.doSomething()=
'/>
+		</JMenu>
+		<JMenu text=3D"Help">
+			<JMenuItem text=3D"About Us" onActionPerformed=3D'engine.showGreeting()'/>
+		</JMenu>
+	</JMenuBar>
 	<java.awt.BorderLayout id=3D'BorderLayout'/>=09
-	<JPanel layout=3D'{BorderLayout}'>=09
-		<connexionBar constraints=3D'BorderLayout.NORTH'/>
+	<JPanel layout=3D'{BorderLayout}'>
+		<JToolBar constraints=3D'BorderLayout.NORTH' opaque=3D'true'>
+
+		<!-- include java files for treatment -->
+
+		<!-- content -->
+
+			<JLabel text=3D'name base :' styleClass=3D'boldUnderline' />
+			<JAXXComboBox>
+				<item value=3D'{null}' label=3D'Select a base name'  />
+				<item value=3D'HBase'/>
+				<item value=3D'Cassandra'/>
+				<item value=3D'Other'/>
+			</JAXXComboBox>
+			<JLabel text=3D'login :' styleClass=3D'boldUnderline' />
+			<JTextField/>
+			<JLabel text=3D'password :' styleClass=3D'boldUnderline' />
+			<JPasswordField/>
+			<JButton text=3D'OK'/>
+		</JToolBar>
 		<JSplitPane constraints=3D'BorderLayout.CENTER' dividerLocation=3D'200' >
-			<tree/>
-			<tableview/>
+			<JScrollPane>
+				<JPanel>
+					<!--
+					<javax.swing.ImageIcon id=3D'databaseIcon' constructorParams=3D'getClas=
s().getResource("images/cylindre32")'/>
+					<JLabel id=3D'label' icon=3D'{databaseIcon}'/>
+					-->
+					<JAXXTree id=3D'baseSchema' showsRootHandles=3D'true' onValueChanged=3D=
'engine.doSomething()' >
+						<item value=3D'No base schema' />
+					</JAXXTree>
+				</JPanel>
+			</JScrollPane>
+			<JScrollPane>
+
+			<!-- include java files for treatment -->
+
+			<!-- content -->
+
+				<VBox horizontalAlignment=3D'center'>
+					<JPanel>
+					</JPanel>
+					<JLabel text=3D"TABLE NAME : TODO"/>
+				</VBox>
+
+			</JScrollPane>
 		</JSplitPane>
 	</JPanel>=09
 </Application>

Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx	201=
0-01-26 08:59:42 UTC (rev 13)
+++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx	201=
0-01-26 13:39:59 UTC (rev 14)
@@ -1,19 +0,0 @@
-<JToolBar opaque=3D'true'>
-
-<!-- include java files for treatment -->
-
-<!-- content -->
-
-	<JLabel text=3D'name base :' styleClass=3D'boldUnderline' />
-	<JComboBox>
-		<item value=3D'{null}' label=3D'Select a base name'  />
-		<item value=3D'HBase'/>
-		<item value=3D'Cassandra'/>
-		<item value=3D'Other'/>
-	</JComboBox>
-	<JLabel text=3D'login :' styleClass=3D'boldUnderline' />
-	<JTextField/>
-	<JLabel text=3D'password :' styleClass=3D'boldUnderline' />
-	<JPasswordField/>
-	<JButton text=3D'OK'/>
-</JToolBar>
\ No newline at end of file

Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/Application=
Engine.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine=
.java	2010-01-26 08:59:42 UTC (rev 13)
+++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine=
.java	2010-01-26 13:39:59 UTC (rev 14)
@@ -13,7 +13,7 @@
      * Show the developers.
      * // TO MODIFY
      */
-    protected final void showGreeting() {
+    public final void showGreeting() {
         JOptionPane.showMessageDialog(null, this,
                 "Developers:\n"
                 + "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"
@@ -28,12 +28,12 @@
     /**
      * Method to close the application.
      */
-    protected final void close() {
+    public final void close() {
         System.exit(0);
     }
=20
     /**
      * do nothing (for instance).
      */
-    protected void doSomething() { }
+    public void doSomething() { }
 }

Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx	2010-01-26 =
08:59:42 UTC (rev 13)
+++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx	2010-01-26 =
13:39:59 UTC (rev 14)
@@ -1,19 +0,0 @@
-<JMenuBar>
-
-<!-- include java files for treatment -->
-<gui.ApplicationEngine id=3D'engine'/>
-
-<!-- content -->
-	<JMenu text=3D"File">
-		<JMenuItem text=3D"Connect" onActionPerformed=3D'engine.doSomething()'/>
-		<JMenuItem text=3D"Disconnect" onActionPerformed=3D'engine.doSomething()'/>
-		<JSeparator/>
-		<JMenuItem text=3D"Quit" onActionPerformed=3D'engine.close()'/>
-	</JMenu>
-	<JMenu text=3D"Edit">
-		<JMenuItem text=3D"Preferences" onActionPerformed=3D'engine.doSomething()'=
/>
-	</JMenu>
-	<JMenu text=3D"Help">
-		<JMenuItem text=3D"About Us" onActionPerformed=3D'engine.showGreeting()'/>
-	</JMenu>
-</JMenuBar>
\ No newline at end of file

Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx	2010-0=
1-26 08:59:42 UTC (rev 13)
+++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx	2010-0=
1-26 13:39:59 UTC (rev 14)
@@ -1,13 +0,0 @@
-<JScrollPane>
-
-<!-- include java files for treatment -->				=09
-					=09
-<!-- content -->
-
-	<VBox horizontalAlignment=3D'center'>
-	<JPanel>
-	</JPanel>
-	<JLabel text=3D"TABLE NAME : TODO"/>
-	</VBox>
-
-</JScrollPane>=09
\ No newline at end of file

Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx	2010-01-26 =
08:59:42 UTC (rev 13)
+++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx	2010-01-26 =
13:39:59 UTC (rev 14)
@@ -1,20 +0,0 @@
-<JScrollPane>
-
-<!-- include java files for treatment -->
-<gui.ApplicationEngine id=3D'engine'/>					=09
-					=09
-<!-- content -->
-	<JPanel>
-=09
-		<!--
-		<javax.swing.ImageIcon id=3D'databaseIcon' constructorParams=3D'getClass()=
.getResource("images/cylindre32")'/>
-		<JLabel id=3D'label' icon=3D'{databaseIcon}'/>
-		-->
-	=09
-=09
-		<JTree id=3D'baseSchema' showsRootHandles=3D'true' onValueChanged=3D'engin=
e.doSomething()' >
-							=09
-			<item value=3D'No base schema' />
-		</JTree>
-	</JPanel>=09
-</JScrollPane>=09
\ No newline at end of file

Modified: trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties	2010-01-=
26 08:59:42 UTC (rev 13)
+++ trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties	2010-01-=
26 13:39:59 UTC (rev 14)
@@ -1 +1,15 @@
-mapstoragemanager.hello=3Dhello
+About\ Us=3D
+Connect=3D
+Disconnect=3D
+Edit=3D
+File=3D
+Hello=3D
+Help=3D
+OK=3D
+Preferences=3D
+Quit=3D
+TABLE\ NAME\ \:\ TODO=3D
+login\ \:=3D
+mapstoragemanager.hello=3Dhello
+name\ base\ \:=3D
+password\ \:=3D

Modified: trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties	2010-01-=
26 08:59:42 UTC (rev 13)
+++ trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties	2010-01-=
26 13:39:59 UTC (rev 14)
@@ -1 +1,15 @@
-mapstoragemanager.hello=3Dbonjour
+About\ Us=3D
+Connect=3D
+Disconnect=3D
+Edit=3D
+File=3D
+Hello=3D
+Help=3D
+OK=3D
+Preferences=3D
+Quit=3D
+TABLE\ NAME\ \:\ TODO=3D
+login\ \:=3D
+mapstoragemanager.hello=3Dbonjour
+name\ base\ \:=3D
+password\ \:=3D


--===============3328981031470172940==--