Author: aadamchik
Date: Thu Nov 20 23:34:53 2008
New Revision: 719525
URL: http://svn.apache.org/viewvc?rev=719525&view=rev
Log:
CAY-1138 Stop using "QueryMetadata.isRefreshingObjects()"
disabling refresh setting in the modeler
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java?rev=719525&r1=719524&r2=719525&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java
(original)
+++
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java
Thu Nov 20 23:34:53 2008
@@ -64,14 +64,12 @@
builder.add(cacheStrategy, cc.xywh(3, 3, 2, 1));
builder.addLabel("Fetch Data Rows:", cc.xy(1, 7));
builder.add(dataRows, cc.xy(3, 7));
- builder.addLabel("Refresh Results:", cc.xy(1, 9));
- builder.add(refreshesResults, cc.xy(3, 9));
- builder.addLabel("Fetch Offset, Rows:", cc.xy(1, 11));
- builder.add(fetchOffset.getComponent(), cc.xy(3, 11));
- builder.addLabel("Fetch Limit, Rows:", cc.xy(1, 13));
- builder.add(fetchLimit.getComponent(), cc.xy(3, 13));
- builder.addLabel("Page Size:", cc.xy(1, 15));
- builder.add(pageSize.getComponent(), cc.xy(3, 15));
+ builder.addLabel("Fetch Offset, Rows:", cc.xy(1, 9));
+ builder.add(fetchOffset.getComponent(), cc.xy(3, 9));
+ builder.addLabel("Fetch Limit, Rows:", cc.xy(1, 11));
+ builder.add(fetchLimit.getComponent(), cc.xy(3, 11));
+ builder.addLabel("Page Size:", cc.xy(1, 13));
+ builder.add(pageSize.getComponent(), cc.xy(3, 13));
this.setLayout(new BorderLayout());
this.add(builder.getPanel(), BorderLayout.CENTER);
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java?rev=719525&r1=719524&r2=719525&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
(original)
+++
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
Thu Nov 20 23:34:53 2008
@@ -79,7 +79,7 @@
FormLayout layout = new FormLayout(
"right:max(80dlu;pref), 3dlu, left:max(10dlu;pref), "
+ "3dlu, left:max(37dlu;pref), 3dlu,
fill:max(147dlu;pref)",
- "p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p,
3dlu, p");
+ "p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p");
PanelBuilder builder = new PanelBuilder(layout);
builder.setDefaultDialogBorder();
@@ -91,14 +91,12 @@
builder.addLabel("Fetch Data Objects:", cc.xy(1, 7));
builder.add(dataObjects, cc.xy(3, 7));
builder.add(entities, cc.xywh(5, 7, 3, 1));
- builder.addLabel("Refresh Results:", cc.xy(1, 9));
- builder.add(refreshesResults, cc.xy(3, 9));
- builder.addLabel("Fetch Offset, Rows:", cc.xy(1, 11));
- builder.add(fetchOffset.getComponent(), cc.xywh(3, 11, 3, 1));
- builder.addLabel("Fetch Limit, Rows:", cc.xy(1, 13));
- builder.add(fetchLimit.getComponent(), cc.xywh(3, 13, 3, 1));
- builder.addLabel("Page Size:", cc.xy(1, 15));
- builder.add(pageSize.getComponent(), cc.xywh(3, 15, 3, 1));
+ builder.addLabel("Fetch Offset, Rows:", cc.xy(1, 9));
+ builder.add(fetchOffset.getComponent(), cc.xywh(3, 9, 3, 1));
+ builder.addLabel("Fetch Limit, Rows:", cc.xy(1, 11));
+ builder.add(fetchLimit.getComponent(), cc.xywh(3, 11, 3, 1));
+ builder.addLabel("Page Size:", cc.xy(1, 13));
+ builder.add(pageSize.getComponent(), cc.xywh(3, 13, 3, 1));
return builder;
}
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java?rev=719525&r1=719524&r2=719525&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
(original)
+++
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
Thu Nov 20 23:34:53 2008
@@ -233,8 +233,8 @@
}
CellConstraints cc = new CellConstraints();
- builder.addLabel("Row Label Case:", cc.xy(1, 17));
- builder.add(labelCase, cc.xywh(3, 17, 5, 1));
+ builder.addLabel("Row Label Case:", cc.xy(1, 15));
+ builder.add(labelCase, cc.xywh(3, 15, 5, 1));
return builder;
}
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java?rev=719525&r1=719524&r2=719525&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
(original)
+++
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
Thu Nov 20 23:34:53 2008
@@ -28,7 +28,6 @@
import javax.swing.DefaultComboBoxModel;
import javax.swing.DefaultListCellRenderer;
-import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JList;
import javax.swing.JPanel;
@@ -77,7 +76,6 @@
protected TextAdapter fetchLimit;
protected TextAdapter pageSize;
protected JComboBox cacheStrategy;
- protected JCheckBox refreshesResults;
protected ProjectController mediator;
@@ -111,7 +109,6 @@
cacheStrategy = CayenneWidgetFactory.createComboBox();
cacheStrategy.setRenderer(new CacheStrategyRenderer());
- refreshesResults = new JCheckBox();
}
protected void initController() {
@@ -122,14 +119,6 @@
setQueryProperty("cacheStrategy", strategy);
}
});
-
- refreshesResults.addActionListener(new ActionListener() {
-
- public void actionPerformed(ActionEvent event) {
- Boolean b = refreshesResults.isSelected() ? Boolean.TRUE :
Boolean.FALSE;
- setQueryProperty("refreshingObjects", b);
- }
- });
}
/**
@@ -152,7 +141,6 @@
fetchOffset.setText(String.valueOf(query.getMetaData(resolver).getFetchOffset()));
fetchLimit.setText(String.valueOf(query.getMetaData(resolver).getFetchLimit()));
pageSize.setText(String.valueOf(query.getMetaData(resolver).getPageSize()));
-
refreshesResults.setSelected(query.getMetaData(resolver).isRefreshingObjects());
}
void setFetchOffset(String string) {
