diff --git a/designer-base/src/com/fr/design/actions/server/FunctionManagerAction.java b/designer-base/src/com/fr/design/actions/server/FunctionManagerAction.java
index f06d5d2dfc..3358e2cc42 100644
--- a/designer-base/src/com/fr/design/actions/server/FunctionManagerAction.java
+++ b/designer-base/src/com/fr/design/actions/server/FunctionManagerAction.java
@@ -59,7 +59,8 @@ public class FunctionManagerAction extends UpdateAction {
}
});
- functionManagerPane.populate(functionManager.mirror());
+ FunctionConfig mirror = functionManager.mirror();
+ functionManagerPane.populate(mirror);
functionManagerDialog.setVisible(true);
}
diff --git a/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java
index aa13446126..b723b9928a 100644
--- a/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java
+++ b/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java
@@ -69,7 +69,9 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
final TableDataConfig tableDataConfig = TableDataConfig.getInstance();
final TableDataManagerPane globalTableDataPane = new TableDataManagerPane() {
public void complete() {
- populate(tableDataConfig.mirror());
+
+ TableDataConfig mirror = tableDataConfig.mirror();
+ populate(mirror);
}
protected void renameConnection(final String oldName, final String newName) {
diff --git a/designer-base/src/com/fr/design/actions/server/ProcedureListAction.java b/designer-base/src/com/fr/design/actions/server/ProcedureListAction.java
index 0b879f49d6..53b41097e2 100644
--- a/designer-base/src/com/fr/design/actions/server/ProcedureListAction.java
+++ b/designer-base/src/com/fr/design/actions/server/ProcedureListAction.java
@@ -36,7 +36,9 @@ public class ProcedureListAction extends UpdateAction {
final ProcedureConfig procedureConfig = ProcedureConfig.getInstance();
final ProcedureManagerPane databaseManagerPane = new ProcedureManagerPane() {
public void complete() {
- populate(procedureConfig.mirror());
+
+ ProcedureConfig mirror = procedureConfig.mirror();
+ populate(mirror);
}
};
BasicDialog databaseListDialog = databaseManagerPane.showLargeWindow(designerFrame, null);
diff --git a/designer-base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer-base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
index 40bc993a44..47d8ab27d1 100644
--- a/designer-base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
+++ b/designer-base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
@@ -5,7 +5,6 @@ import com.fr.base.FRContext;
import com.fr.base.Parameter;
import com.fr.base.ParameterHelper;
import com.fr.data.core.db.TableProcedure;
-import com.fr.data.impl.AbstractDatabaseConnection;
import com.fr.data.impl.Connection;
import com.fr.data.impl.DBTableData;
import com.fr.data.impl.JDBCDatabaseConnection;
@@ -42,7 +41,6 @@ import com.fr.script.Calculator;
import com.fr.stable.ArrayUtils;
import com.fr.stable.ParameterProvider;
import com.fr.stable.StringUtils;
-import org.sqlite.JDBC;
import javax.swing.*;
import javax.swing.text.BadLocationException;
diff --git a/designer-realize/src/com/fr/design/actions/server/ServerConfigManagerAction.java b/designer-realize/src/com/fr/design/actions/server/ServerConfigManagerAction.java
index fa284fedc6..856d74a480 100644
--- a/designer-realize/src/com/fr/design/actions/server/ServerConfigManagerAction.java
+++ b/designer-realize/src/com/fr/design/actions/server/ServerConfigManagerAction.java
@@ -42,7 +42,9 @@ public class ServerConfigManagerAction extends UpdateAction {
final EditReportServerParameterPane editReportServerParameterPane = new EditReportServerParameterPane() {
@Override
public void complete() {
- populate(config.mirror());
+
+ ServerPreferenceConfig mirror = config.mirror();
+ populate(mirror);
}
};
diff --git a/designer-realize/src/com/fr/design/actions/server/StyleListAction.java b/designer-realize/src/com/fr/design/actions/server/StyleListAction.java
index e346ad41f5..45e279177b 100644
--- a/designer-realize/src/com/fr/design/actions/server/StyleListAction.java
+++ b/designer-realize/src/com/fr/design/actions/server/StyleListAction.java
@@ -54,8 +54,8 @@ public class StyleListAction extends UpdateAction {
}
});
-
- styleListPane.populate(ServerPreferenceConfig.getInstance().mirror());
+ ServerPreferenceConfig mirror = ServerPreferenceConfig.getInstance().mirror();
+ styleListPane.populate(mirror);
styleListDialog.setVisible(true);
}
diff --git a/designer-realize/src/com/fr/design/actions/server/WidgetManagerAction.java b/designer-realize/src/com/fr/design/actions/server/WidgetManagerAction.java
index 5f7afd5754..b7cb025e8d 100644
--- a/designer-realize/src/com/fr/design/actions/server/WidgetManagerAction.java
+++ b/designer-realize/src/com/fr/design/actions/server/WidgetManagerAction.java
@@ -37,7 +37,8 @@ public class WidgetManagerAction extends UpdateAction {
final WidgetManagerPane widgetManagerPane = new WidgetManagerPane() {
@Override
public void complete() {
- populate(widgetManager.mirror());
+ WidgetInfoConfig mirror = widgetManager.mirror();
+ populate(mirror);
}
};
diff --git a/pom.xml b/pom.xml
index 5555147998..f30a162374 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,13 +17,6 @@
designer-form
designer-realize
-
-
- com.fr.report
- fine-report-engine
- 10.0-FEATURE-SNAPSHOT
-
-
com.fr.report
designer
10.0-FEATURE-SNAPSHOT