Author: kevin1219
Date: Thu Aug 28 07:15:12 2008
New Revision: 2645
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/DimensionUsageEditPanel.java
trunk/src/ca/sqlpower/architect/swingui/olap/UsageComponent.java
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateDimensionUsageAction.java
Log:
Apparently, mondrian doesn't allow public dimensions to have foreignKey at
all. So took that part out, makes the code simpler by the way.
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/DimensionUsageEditPanel.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/olap/DimensionUsageEditPanel.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/olap/DimensionUsageEditPanel.java
Thu Aug 28 07:15:12 2008
@@ -29,7 +29,6 @@
import ca.sqlpower.architect.SQLTable;
import ca.sqlpower.architect.olap.OLAPUtil;
import ca.sqlpower.architect.olap.MondrianModel.Cube;
-import ca.sqlpower.architect.olap.MondrianModel.Dimension;
import ca.sqlpower.architect.olap.MondrianModel.DimensionUsage;
import ca.sqlpower.swingui.DataEntryPanel;
@@ -46,22 +45,16 @@
private JComboBox foreignKeyChooser;
- private final Dimension dimension;
-
/**
* Creates a new property editor for the given dimension usage.
*
* @param dimensionUsage
* usage The data model of the dimension usage to edit
- * @param dimension
- * The dimension this dimension usage is referring to
- *
* @throws ArchitectException
* if digging up the source table results in a database
error
*/
- public DimensionUsageEditPanel(DimensionUsage dimensionUsage,
Dimension dimension) throws ArchitectException {
+ public DimensionUsageEditPanel(DimensionUsage dimensionUsage) throws
ArchitectException {
this.dimensionUsage = dimensionUsage;
- this.dimension = dimension;
FormLayout layout = new FormLayout("left:max(40dlu;pref), 3dlu,
80dlu:grow", "");
DefaultFormBuilder builder = new DefaultFormBuilder(layout);
@@ -100,7 +93,6 @@
SQLColumn selectedCol = (SQLColumn)
foreignKeyChooser.getSelectedItem();
String pk = selectedCol.getName();
dimensionUsage.setForeignKey(pk);
- dimension.setForeignKey(pk);
}
dimensionUsage.endCompoundEdit();
return true;
Modified: trunk/src/ca/sqlpower/architect/swingui/olap/UsageComponent.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/olap/UsageComponent.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/olap/UsageComponent.java Thu
Aug 28 07:15:12 2008
@@ -29,7 +29,6 @@
import ca.sqlpower.architect.layout.LayoutEdge;
import ca.sqlpower.architect.layout.LayoutNode;
import ca.sqlpower.architect.olap.OLAPObject;
-import ca.sqlpower.architect.olap.MondrianModel.Dimension;
import ca.sqlpower.architect.olap.MondrianModel.DimensionUsage;
import ca.sqlpower.architect.swingui.ASUtils;
import ca.sqlpower.architect.swingui.PlayPen;
@@ -104,15 +103,7 @@
if (model instanceof DimensionUsage) {
try {
DimensionUsage du = (DimensionUsage) model;
- Dimension d;
- if (pane1.getModel() instanceof Dimension) {
- d = (Dimension) pane1.getModel();
- } else if (pane2.getModel() instanceof Dimension) {
- d = (Dimension) pane2.getModel();
- } else {
- throw new IllegalStateException("Couldn't find
referenced Dimension of: " + du);
- }
- DataEntryPanel panel = new
DimensionUsageEditPanel(du, d);
+ DataEntryPanel panel = new
DimensionUsageEditPanel(du);
if (panel != null) {
Window owner =
SwingUtilities.getWindowAncestor(getPlayPen());
JDialog dialog =
DataEntryPanelBuilder.createDataEntryPanelDialog(panel, owner,
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateDimensionUsageAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateDimensionUsageAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateDimensionUsageAction.java
Thu Aug 28 07:15:12 2008
@@ -68,7 +68,7 @@
playpen.getContentPane().add(uc,
playpen.getContentPane().getComponentCount());
try {
- final DataEntryPanel mep = new DimensionUsageEditPanel(du,
dimension);
+ final DataEntryPanel mep = new DimensionUsageEditPanel(du);
Callable<Boolean> okCall = new Callable<Boolean>() {
public Boolean call() throws Exception {
return mep.applyChanges();
