ntforms behaves as a library so, it should not contain either UI or i…

…18n resources inside it. If we place i18n resource in the library, in order to retrieve them using gvSIG conventions and tools (for example: PluginServices.getText() ) we should deploy ntforms as a extension within gvSIG workspace. In order to avoid this and make ntforms behaves as a library, the UI and i18n resources are dropped and they should live in other places (navtable, the extension inheriting from ntforms, etc).
navtable · Feb 27, 2012 · 1d4231b · 1d4231b
1 parent 1bcb8ea
commit 1d4231b
Show file tree

Hide file tree

Showing 18 changed files with 14 additions and 8 deletions.
diff --git a/build.xml b/build.xml
@@ -43,8 +43,6 @@
 
 	<target name="copy-data-files">
 		<copy file="config/config.xml" todir="${dist}" />
-		<copy file="config/text_es.properties" todir="${dist}" />
-		<copy file="config/text_en.properties" todir="${dist}" />
 
 		<copy todir="${dist}/lib">
 	  	    	<fileset dir="lib" includes="*"/>

diff --git a/config/text_en.properties b/config/text_en.properties
diff --git a/config/text_es.properties b/config/text_es.properties
diff --git a/images/Select.png b/images/Select.png
diff --git a/images/Unselect.png b/images/Unselect.png
diff --git a/images/copy-selected.png b/images/copy-selected.png
diff --git a/images/copy.png b/images/copy.png
diff --git a/images/delete.png b/images/delete.png
diff --git a/images/filter.png b/images/filter.png
diff --git a/images/go-first.png b/images/go-first.png
diff --git a/images/go-last.png b/images/go-last.png
diff --git a/images/go-next.png b/images/go-next.png
diff --git a/images/go-previous.png b/images/go-previous.png
diff --git a/images/nofilter.png b/images/nofilter.png
diff --git a/images/save.png b/images/save.png
diff --git a/images/zoom.png b/images/zoom.png
diff --git a/src/es/icarto/gvsig/navtableforms/launcher/AlphanumericNavTableLauncher.java b/src/es/icarto/gvsig/navtableforms/launcher/AlphanumericNavTableLauncher.java
@@ -65,8 +65,7 @@ public void mouseClicked(MouseEvent e) {
 	    JPopupMenu popup = new JPopupMenu();
 
 	    JMenuItem menuOpenANT = new JMenuItem(
-		    PluginServices.getText(this, "open_table")
-		    + " " + params.getAlphanumericNavTableTitle());
+		    params.getMenuOpenText());
 	    menuOpenANT.addActionListener(new ActionListener() {
 		public void actionPerformed(ActionEvent arg0) {
 		    openANT();

diff --git a/src/es/icarto/gvsig/navtableforms/launcher/LauncherParams.java b/src/es/icarto/gvsig/navtableforms/launcher/LauncherParams.java
@@ -22,13 +22,20 @@ public class LauncherParams {
     private ILauncherForm form;
     private String tableName;
     private String antTitle;
+    private String menuOpenText;
 
-    public LauncherParams(ILauncherForm form, String tableName, String antTitle) {
+    public LauncherParams(ILauncherForm form, 
+	    String tableName, 
+	    String antTitle,
+	    String menuOpenText) {
+
+	this.form = form;
 	this.tableName = tableName;
 	this.antTitle = antTitle;
-	this.form = form;
+	this.menuOpenText = menuOpenText;
     }
 
+
     public String getTableName() {
 	return this.tableName;
     }
@@ -37,6 +44,10 @@ public String getAlphanumericNavTableTitle() {
 	return this.antTitle;
     }
 
+    public String getMenuOpenText() {
+	return this.menuOpenText;
+    }
+
     /**
      * Get SQLQuery from form. This way, dinamic values as the ones from widgets
      * could be retrieved in real time. The ID used to get the sql query is the