Author: ulhume
Date: 2008-08-31 12:46:54 +0200 (Sun, 31 Aug 2008)
New Revision: 1666
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParameterEditorLabelRenderer.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParametersEditorValueRenderer.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/PropertiesTableModel.java
Log:
Better handling of proprerty visibility
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParameterEditorLabelRenderer.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParameterEditorLabelRenderer.java
2008-08-31 10:44:04 UTC (rev 1665)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParameterEditorLabelRenderer.java
2008-08-31 10:46:54 UTC (rev 1666)
@@ -41,12 +41,6 @@
public Component getTableCellRendererComponent(JTable table, Object
value, boolean isSelected, boolean hasFocus, int row, int column) {
GadgetParameter record = (GadgetParameter) value;
- if (!record.isVisible()) {
- label.setText("");
- label.setSize(0, 0);
- label.setPreferredSize(label.getSize());
- return label;
- }
label.setHorizontalAlignment(JLabel.RIGHT);
label.setFont(new Font("dialog", Font.BOLD, 12));
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParametersEditorValueRenderer.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParametersEditorValueRenderer.java
2008-08-31 10:44:04 UTC (rev 1665)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParametersEditorValueRenderer.java
2008-08-31 10:46:54 UTC (rev 1666)
@@ -63,12 +63,7 @@
});
return checkbox;
} else {
- if (!gadget.getParameters().get(row).isVisible()) {
- label.setText("");
- label.setSize(0, 0);
- label.setPreferredSize(label.getSize());
- return label;
- }
+
label.setText(values.get(gadget.getParameters().get(row)));
label.setFont(new Font("dialog", Font.PLAIN, 12));
return label;
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/PropertiesTableModel.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/PropertiesTableModel.java
2008-08-31 10:44:04 UTC (rev 1665)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/PropertiesTableModel.java
2008-08-31 10:46:54 UTC (rev 1666)
@@ -20,67 +20,74 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package com.kysoh.tuxdroid.gadget.framework.propertyEditor;
-
-import java.util.Vector;
-
-import javax.swing.table.AbstractTableModel;
-
-import com.kysoh.tuxdroid.gadget.framework.container.GadgetInstanceParameters;
-import com.kysoh.tuxdroid.gadget.framework.container.GadgetParameter;
-
-public final class PropertiesTableModel extends AbstractTableModel {
+package com.kysoh.tuxdroid.gadget.framework.propertyEditor;
+import java.util.Vector;
+
+import javax.swing.table.AbstractTableModel;
+
+import com.kysoh.tuxdroid.gadget.framework.container.GadgetInstanceParameters;
+import com.kysoh.tuxdroid.gadget.framework.container.GadgetParameter;
+
+public final class PropertiesTableModel extends AbstractTableModel {
+
private static final long serialVersionUID = 9060125529956396016L;
- private final Vector<GadgetParameter> parameters;
- private final GadgetInstanceParameters values;
-
- public PropertiesTableModel(Vector<GadgetParameter> parameters,
GadgetInstanceParameters values) {
- super();
- this.parameters = parameters;
- this.values = values;
- }
-
- @Override
- public int getColumnCount() {
- return 2;
- }
-
- /*
- * (non-Javadoc)
- * @see javax.swing.table.AbstractTableModel#getColumnName(int)
- */
- @Override
- public String getColumnName(int column) {
- if (column == 0) {
- return "Name";
- } else
- return "Value";
- }
-
- @Override
- public void setValueAt(Object value, int rowIndex, int columnIndex) {
- GadgetParameter parameter = parameters.get(rowIndex);
- values.setValue(parameter, (String) value);
- }
-
- @Override
- public boolean isCellEditable(int rowIndex, int columnIndex) {
- return columnIndex == 1;
- }
-
- @Override
- public int getRowCount() {
- return parameters.size();
- }
-
- @Override
- public Object getValueAt(int rowIndex, int columnIndex) {
- GadgetParameter parameter = parameters.get(rowIndex);
- if (columnIndex == 0) {
- return parameter;
- } else {
- return values.get(parameter);
- }
- }
-}
+ private final Vector<GadgetParameter> parameters;
+ private final Vector<GadgetParameter> visibleParameters;
+ private final GadgetInstanceParameters values;
+
+ public PropertiesTableModel(Vector<GadgetParameter> parameters,
GadgetInstanceParameters values) {
+ super();
+ this.parameters = parameters;
+ this.values = values;
+ this.visibleParameters = parameters;
+ for (int i = visibleParameters.size() - 1; i >= 0; i--) {
+ if (!visibleParameters.get(i).isVisible()) {
+ visibleParameters.remove(i);
+ }
+ }
+ }
+
+ @Override
+ public int getColumnCount() {
+ return 2;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see javax.swing.table.AbstractTableModel#getColumnName(int)
+ */
+ @Override
+ public String getColumnName(int column) {
+ if (column == 0) {
+ return "Name";
+ } else
+ return "Value";
+ }
+
+ @Override
+ public void setValueAt(Object value, int rowIndex, int columnIndex) {
+ GadgetParameter parameter = visibleParameters.get(rowIndex);
+ values.setValue(parameter, (String) value);
+ }
+
+ @Override
+ public boolean isCellEditable(int rowIndex, int columnIndex) {
+ return columnIndex == 1;
+ }
+
+ @Override
+ public int getRowCount() {
+ return visibleParameters.size();
+ }
+
+ @Override
+ public Object getValueAt(int rowIndex, int columnIndex) {
+ GadgetParameter parameter = visibleParameters.get(rowIndex);
+ if (columnIndex == 0) {
+ return parameter;
+ } else {
+ return values.get(parameter);
+ }
+ }
+}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
