Browse Source

Merge pull request #27 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0

* commit '9d600f51bd964d37817bbdfb90ebea99ae071067':
  无JIRA任务 designer maven
  无JIRA任务 设计器maven
master
superman 7 years ago
parent
commit
6b6d3b92e5
  1. 3
      designer-base/src/com/fr/design/actions/server/FunctionManagerAction.java
  2. 4
      designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java
  3. 4
      designer-base/src/com/fr/design/actions/server/ProcedureListAction.java
  4. 2
      designer-base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
  5. 4
      designer-realize/src/com/fr/design/actions/server/ServerConfigManagerAction.java
  6. 4
      designer-realize/src/com/fr/design/actions/server/StyleListAction.java
  7. 3
      designer-realize/src/com/fr/design/actions/server/WidgetManagerAction.java
  8. 9
      pom.xml

3
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);
}

4
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) {

4
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);

2
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;

4
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);
}
};

4
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);
}

3
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);
}
};

9
pom.xml

@ -17,15 +17,8 @@
<module>designer-form</module>
<module>designer-realize</module>
</modules>
<dependencies>
<dependency>
<groupId>com.fr.report</groupId>
<artifactId>fine-report-engine</artifactId>
<version>10.0-FEATURE-SNAPSHOT</version>
</dependency>
</dependencies>
<groupId>com.fr.report</groupId>
<artifactId>designer</artifactId>
<artifactId>design</artifactId>
<version>10.0-FEATURE-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
Loading…
Cancel
Save