Version 12, December 2010

[GpsPrune.git] / tim / prune / function / gpsies / TrackListModel.java

diff --git a/tim/prune/function/gpsies/TrackListModel.java b/tim/prune/function/gpsies/TrackListModel.java
index 275ae83ab715117841efc47dae90d0bf18160354..3a7326f647409b131d70964ad48279ac086ab275 100644 (file)
--- a/tim/prune/function/gpsies/TrackListModel.java
+++ b/tim/prune/function/gpsies/TrackListModel.java
@@ -5,8 +5,8 @@ import java.util.ArrayList;
 
 import javax.swing.table.AbstractTableModel;
 
-import tim.prune.Config;
 import tim.prune.I18nManager;
+import tim.prune.config.Config;
 import tim.prune.data.Distance;
 
 /**
@@ -17,17 +17,26 @@ public class TrackListModel extends AbstractTableModel
        /** List of tracks */
        private ArrayList<GpsiesTrack> _trackList = null;
        /** Column heading for track name */
-       private static final String _nameColLabel = I18nManager.getText("dialog.gpsies.column.name");
+       private String _nameColLabel = null;
        /** Column heading for length */
-       private static final String _lengthColLabel = I18nManager.getText("dialog.gpsies.column.length");
+       private String _lengthColLabel = null;
+       /** Number of columns */
+       private int _numColumns = 2;
        /** Formatter for distances */
        private NumberFormat _distanceFormatter = NumberFormat.getInstance();
 
        /**
         * Constructor
+        * @param inColumn1Key key for first column
+        * @param inColumn2Key key for second column
         */
-       public TrackListModel()
+       public TrackListModel(String inColumn1Key, String inColumn2Key)
        {
+               _nameColLabel = I18nManager.getText(inColumn1Key);
+               if (inColumn2Key != null) {
+                       _lengthColLabel = I18nManager.getText(inColumn2Key);
+               }
+               _numColumns = (_lengthColLabel != null?2:1);
                _distanceFormatter.setMaximumFractionDigits(1);
        }
 
@@ -36,7 +45,7 @@ public class TrackListModel extends AbstractTableModel
         */
        public int getColumnCount()
        {
-               return 2;
+               return _numColumns;
        }
 
        /**