Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #829 in BA/design from ~YAOH.WU/design_0407:release to release 

* commit '049e74143bdceb0424daacca62891c528922d085':
  组件复用边界复制
  REPORT-2273 远程设计数据库连接成功，预览报错，datasourcexml保存失败问题修复
master
superman 8 years ago
parent
d82a174a82 049e74143b
commit
2babd72f99
6 changed files with 580 additions and 558 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 345
      designer_base/src/com/fr/design/actions/server/ConnectionListAction.java
  2. 266
      designer_base/src/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
  3. 324
      designer_base/src/com/fr/design/data/datapane/connect/ConnectionListPane.java
  4. 155
      designer_base/src/com/fr/design/data/datapane/connect/ConnectionManagerPane.java
  5. 15
      designer_base/src/com/fr/design/data/datapane/connect/ConnectionShowPane.java
  6. 33
      designer_form/src/com/fr/design/mainframe/FormSelectionUtils.java

345
designer_base/src/com/fr/design/actions/server/ConnectionListAction.java
Unescape View File

@ -1,171 +1,176 @@
package com.fr.design.actions.server; package com.fr.design.actions.server;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.base.Env; import com.fr.base.Env;
import com.fr.base.FRContext; import com.fr.base.FRContext;
import com.fr.base.ModifiedTable; import com.fr.base.ModifiedTable;
import com.fr.data.impl.Connection; import com.fr.data.impl.Connection;
import com.fr.dav.LocalEnv; import com.fr.dav.LocalEnv;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
import com.fr.design.data.datapane.connect.ConnectionManagerPane; import com.fr.design.data.datapane.connect.ConnectionManagerPane;
import com.fr.design.dialog.BasicDialog; import com.fr.design.data.datapane.connect.ConnectionShowPane;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.BasicDialog;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.mainframe.DesignerFrame; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.menu.MenuKeySet; import com.fr.design.mainframe.DesignerFrame;
import com.fr.file.DatasourceManager; import com.fr.design.menu.MenuKeySet;
import com.fr.file.DatasourceManagerProvider; import com.fr.file.DatasourceManager;
import com.fr.general.Inter; import com.fr.file.DatasourceManagerProvider;
import com.fr.general.Inter;
import javax.swing.*;
import java.awt.event.ActionEvent; import javax.swing.*;
import java.util.HashMap; import java.awt.event.ActionEvent;
import java.util.HashMap;
/**
* DatasourceList Action /**
*/ * DatasourceList Action
public class ConnectionListAction extends UpdateAction { */
private static final int BYTENUM = 1444; public class ConnectionListAction extends UpdateAction {
public ConnectionListAction() { public ConnectionListAction() {
this.setMenuKeySet(DEFINE_DATA_CONNECTION); this.setMenuKeySet(DEFINE_DATA_CONNECTION);
this.setName(getMenuKeySet().getMenuKeySetName()); this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic()); this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_web/connection.png")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_web/connection.png"));
} }
public static final MenuKeySet DEFINE_DATA_CONNECTION = new MenuKeySet() { public static final MenuKeySet DEFINE_DATA_CONNECTION = new MenuKeySet() {
@Override @Override
public char getMnemonic() { public char getMnemonic() {
return 'D'; return 'D';
} }
@Override @Override
public String getMenuName() { public String getMenuName() {
return Inter.getLocText("Server-Define_Data_Connection"); return Inter.getLocText("Server-Define_Data_Connection");
} }
@Override @Override
public KeyStroke getKeyStroke() { public KeyStroke getKeyStroke() {
return null; return null;
} }
}; };
/** /**
* 执行动作 * 执行动作
* *
* @param evt 事件 * @param evt 事件
*/ */
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
DesignerFrame designerFrame = DesignerContext.getDesignerFrame(); DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
final DatasourceManagerProvider datasourceManager = DatasourceManager.getProviderInstance(); final DatasourceManagerProvider datasourceManager = DatasourceManager.getProviderInstance();
final DatasourceManager backupManager = datasourceManager.getBackUpManager(); final DatasourceManager backupManager = datasourceManager.getBackUpManager();
final ConnectionManagerPane databaseManagerPane = new ConnectionManagerPane() { final ConnectionManagerPane databaseManagerPane = new ConnectionManagerPane() {
public void complete() { public void complete() {
populate(datasourceManager); populate(datasourceManager);
} }
protected void renameConnection(String oldName, String newName) { protected void renameConnection(String oldName, String newName) {
datasourceManager.getConnectionLocalModifyTable().rename(oldName, newName); datasourceManager.getConnectionLocalModifyTable().rename(oldName, newName);
} }
}; };
final BasicDialog databaseListDialog = databaseManagerPane.showLargeWindow(designerFrame, null); final BasicDialog databaseListDialog = databaseManagerPane.showLargeWindow(designerFrame, null);
databaseListDialog.addDialogActionListener(new DialogActionAdapter() { databaseListDialog.addDialogActionListener(new DialogActionAdapter() {
public void doOk() { public void doOk() {
if (!databaseManagerPane.isNamePermitted()) { if (!databaseManagerPane.isNamePermitted()) {
databaseListDialog.setDoOKSucceed(false); databaseListDialog.setDoOKSucceed(false);
return; return;
} }
if (!doWithDatasourceManager(datasourceManager, backupManager, databaseManagerPane, databaseListDialog)) { if (!doWithDatasourceManager(datasourceManager, backupManager, databaseManagerPane, databaseListDialog)) {
//如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面 //如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面
return; return;
} }
// marks:保存数据 // marks:保存数据
writeFile(datasourceManager); writeFile(datasourceManager);
} }
public void doCancel() { public void doCancel() {
datasourceManager.synchronizedWithServer(); datasourceManager.synchronizedWithServer();
} }
}); });
databaseListDialog.setVisible(true); databaseListDialog.setVisible(true);
} }
private void writeFile(DatasourceManagerProvider datasourceManager) { /**
Env currentEnv = FRContext.getCurrentEnv(); * @param datasourceManager
try { */
boolean isSuccess = currentEnv.writeResource(datasourceManager); public static void writeFile(DatasourceManagerProvider datasourceManager) {
if (!isSuccess) { Env currentEnv = FRContext.getCurrentEnv();
throw new RuntimeException(Inter.getLocText("FR-Designer_Already_exist")); try {
} boolean isSuccess = currentEnv.writeResource(datasourceManager);
} catch (Exception e) { if (!isSuccess) {
throw new RuntimeException(Inter.getLocText("FR-Designer_Already_exist")); throw new RuntimeException(Inter.getLocText("FR-Designer_Already_exist"));
} }
DesignerContext.getDesignerBean("databasename").refreshBeanElement(); } catch (Exception e) {
} throw new RuntimeException(Inter.getLocText("FR-Designer_Already_exist"));
}
/** DesignerContext.getDesignerBean("databasename").refreshBeanElement();
* 是否正常更新完datasourceManager }
*
* @param datasourceManager /**
* @param databaseManagerPane * 更新datasourceManager
* @return *
*/ * @param datasourceManager datasource管理对象
private boolean doWithDatasourceManager(DatasourceManagerProvider datasourceManager, DatasourceManager backupManager, * @param backupManager datasource管理对象备份
ConnectionManagerPane databaseManagerPane, BasicDialog databaseListDialog) { * @param connectionShowPane datasource面板
databaseManagerPane.update(datasourceManager); * @param databaseListDialog datasource管理对话框
HashMap<String, Connection> modifyDetails = datasourceManager.getConnectionModifyDetails(); * @return boolean 是否更新成功
modifyDetails.clear(); */
Env currentEnv = FRContext.getCurrentEnv(); public static boolean doWithDatasourceManager(DatasourceManagerProvider datasourceManager, DatasourceManager
ModifiedTable localModifiedTable = datasourceManager.checkConnectionModifyTable(backupManager, currentEnv.getUserID()); backupManager, ConnectionShowPane connectionShowPane, BasicDialog databaseListDialog) {
boolean isFailed = false; connectionShowPane.update(datasourceManager);
if (currentEnv.isSupportLocalFileOperate() && !((LocalEnv) currentEnv).isNoRemoteUser()) { HashMap<String, Connection> modifyDetails = datasourceManager.getConnectionModifyDetails();
//如果是本地，并且有远程用户时则更新自己的修改表 modifyDetails.clear();
datasourceManager.updateSelfConnectionTotalModifiedTable(localModifiedTable, ModifiedTable.LOCAL_MODIFIER); Env currentEnv = FRContext.getCurrentEnv();
} else { ModifiedTable localModifiedTable = datasourceManager.checkConnectionModifyTable(backupManager, currentEnv.getUserID());
if (!currentEnv.isSupportLocalFileOperate()) { boolean isFailed = false;
//如果是远程，则去取服务器的最新的修改表,检查有没有冲突 if (currentEnv.isSupportLocalFileOperate() && !((LocalEnv) currentEnv).isNoRemoteUser()) {
ModifiedTable currentServerModifyTable = currentEnv.getDataSourceModifiedTables(DatasourceManager.CONNECTION); //如果是本地，并且有远程用户时则更新自己的修改表
if (localModifiedTable.checkModifiedTableConflictWithServer(currentServerModifyTable, currentEnv.getUserID())) { datasourceManager.updateSelfConnectionTotalModifiedTable(localModifiedTable, ModifiedTable.LOCAL_MODIFIER);
//有冲突，进行提示 } else {
String title = Inter.getLocText(new String[]{"Select", "Single", "Setting"}); if (!currentEnv.isSupportLocalFileOperate()) {
int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), localModifiedTable.getWaringMessage(), title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); //如果是远程，则去取服务器的最新的修改表,检查有没有冲突
if (returnVal == JOptionPane.YES_OPTION) { ModifiedTable currentServerModifyTable = currentEnv.getDataSourceModifiedTables(DatasourceManager.CONNECTION);
//点击是，进行相应刷新去冲突 if (localModifiedTable.checkModifiedTableConflictWithServer(currentServerModifyTable, currentEnv.getUserID())) {
datasourceManager.synchronizedWithServer(backupManager, DatasourceManager.CONNECTION); //有冲突，进行提示
//要是有重命名冲突的，则对详细的修改表先进行修改 String title = Inter.getLocText(new String[]{"Select", "Single", "Setting"});
datasourceManager.doWithConnectionConflict(localModifiedTable); int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), localModifiedTable.getWaringMessage(), title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
localModifiedTable.removeConfilct(); if (returnVal == JOptionPane.YES_OPTION) {
modifyDetails.clear(); //点击是，进行相应刷新去冲突
//更新面板 datasourceManager.synchronizedWithServer(backupManager, DatasourceManager.CONNECTION);
databaseManagerPane.populate(datasourceManager); //要是有重命名冲突的，则对详细的修改表先进行修改
} else { datasourceManager.doWithConnectionConflict(localModifiedTable);
//更新失败，继续停留页面 localModifiedTable.removeConfilct();
isFailed = true; modifyDetails.clear();
} //更新面板
connectionShowPane.populate(datasourceManager);
} } else {
} //更新失败，继续停留页面
} isFailed = true;
//存在请重命名则不能更新 }
int index = datasourceManager.isConnectionMapContainsRename();
if (index != -1) { }
isFailed = true; }
databaseManagerPane.setSelectedIndex(index); }
} //存在请重命名则不能更新
databaseListDialog.setDoOKSucceed(!isFailed); int index = datasourceManager.isConnectionMapContainsRename();
//如果修改成功，则去远程端增量修改修改表 if (index != -1) {
if (!isFailed && !currentEnv.isSupportLocalFileOperate()) { isFailed = true;
currentEnv.writeDataSourceModifiedTables(localModifiedTable, DatasourceManager.CONNECTION); connectionShowPane.setSelectedIndex(index);
localModifiedTable.clear(); }
modifyDetails.clear(); databaseListDialog.setDoOKSucceed(!isFailed);
} //如果修改成功，则去远程端增量修改修改表
return !isFailed; if (!isFailed && !currentEnv.isSupportLocalFileOperate()) {
} currentEnv.writeDataSourceModifiedTables(localModifiedTable, DatasourceManager.CONNECTION);
localModifiedTable.clear();
modifyDetails.clear();
public void update() { }
this.setEnabled(true); return !isFailed;
} }
public void update() {
this.setEnabled(true);
}
} }

266
designer_base/src/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
Unescape View File

@ -1,128 +1,140 @@
package com.fr.design.data.datapane.connect; package com.fr.design.data.datapane.connect;
import com.fr.base.Env; import com.fr.base.FRContext;
import com.fr.base.FRContext; import com.fr.data.impl.AbstractDatabaseConnection;
import com.fr.data.impl.AbstractDatabaseConnection; import com.fr.data.impl.Connection;
import com.fr.data.impl.Connection; import com.fr.data.impl.NameDatabaseConnection;
import com.fr.data.impl.NameDatabaseConnection; import com.fr.design.DesignerEnvManager;
import com.fr.design.DesignerEnvManager; import com.fr.design.actions.server.ConnectionListAction;
import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionAdapter;
import com.fr.file.DatasourceManager; import com.fr.file.DatasourceManager;
import com.fr.file.DatasourceManagerProvider; import com.fr.file.DatasourceManagerProvider;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import javax.swing.*; import javax.swing.*;
import java.awt.event.ItemEvent; import java.awt.event.ItemEvent;
import java.awt.event.ItemListener; import java.awt.event.ItemListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.Iterator;
import java.util.List;
/**
* 选择数据连接的下拉框 /**
* * 选择数据连接的下拉框
* @editor zhou *
* @since 2012-3-28下午3:02:30 * @editor zhou
*/ * @since 2012-3-28下午3:02:30
public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel { */
/** public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
* /**
*/ *
private static final long serialVersionUID = 1L; */
private Class<? extends Connection> cls; // 所取的Connection都是cls及其子类 private static final long serialVersionUID = 1L;
private java.util.List<String> nameList = new ArrayList<String>(); private Class<? extends Connection> cls; // 所取的Connection都是cls及其子类
private List<String> nameList = new ArrayList<String>();
public ConnectionComboBoxPanel(Class<? extends Connection> cls) {
super(); public ConnectionComboBoxPanel(Class<? extends Connection> cls) {
super();
this.cls = cls;
this.cls = cls;
// alex:添加item change监听,当改变时改变DesignerEnvManager中的最近选中的数据连接
this.itemComboBox.addItemListener(new ItemListener() { // alex:添加item change监听,当改变时改变DesignerEnvManager中的最近选中的数据连接
public void itemStateChanged(ItemEvent e) { this.itemComboBox.addItemListener(new ItemListener() {
String selected = ConnectionComboBoxPanel.this.getSelectedItem(); public void itemStateChanged(ItemEvent e) {
if (StringUtils.isNotBlank(selected)) { String selected = ConnectionComboBoxPanel.this.getSelectedItem();
DesignerEnvManager.getEnvManager().setRecentSelectedConnection(selected); if (StringUtils.isNotBlank(selected)) {
} DesignerEnvManager.getEnvManager().setRecentSelectedConnection(selected);
} }
}); }
refreshItems(); });
} refreshItems();
}
/*
* 刷新ComboBox.items /*
*/ * 刷新ComboBox.items
protected java.util.Iterator<String> items() { */
nameList = new ArrayList<String>(); protected Iterator<String> items() {
nameList = new ArrayList<String>();
DatasourceManagerProvider mgr = DatasourceManager.getProviderInstance();
java.util.Iterator<String> nameIt = mgr.getConnectionNameIterator(); DatasourceManagerProvider mgr = DatasourceManager.getProviderInstance();
while (nameIt.hasNext()) { Iterator<String> nameIt = mgr.getConnectionNameIterator();
String conName = nameIt.next(); while (nameIt.hasNext()) {
Connection connection = mgr.getConnection(conName); String conName = nameIt.next();
filterConnection(connection, conName, nameList); Connection connection = mgr.getConnection(conName);
} filterConnection(connection, conName, nameList);
}
return nameList.iterator();
} return nameList.iterator();
}
protected void filterConnection(Connection connection, String conName, List<String> nameList) {
connection.addConnection(nameList, conName, new Class[]{AbstractDatabaseConnection.class}); protected void filterConnection(Connection connection, String conName, List<String> nameList) {
} connection.addConnection(nameList, conName, new Class[]{AbstractDatabaseConnection.class});
}
public int getConnectionSize() { public int getConnectionSize() {
return nameList.size(); return nameList.size();
} }
public String getConnection(int i) { public String getConnection(int i) {
return nameList.get(i); return nameList.get(i);
} }
/* /*
* 弹出对话框编辑Items * 弹出对话框编辑Items
*/ */
protected void editItems() { protected void editItems() {
final ConnectionListPane connectionListPane = new ConnectionListPane(); final ConnectionListPane connectionListPane = new ConnectionListPane();
final DatasourceManagerProvider datasourceManager = DatasourceManager.getProviderInstance(); final DatasourceManagerProvider datasourceManager = DatasourceManager.getProviderInstance();
connectionListPane.populate(datasourceManager); final DatasourceManager backupManager = datasourceManager.getBackUpManager();
BasicDialog connectionListDialog = connectionListPane.showLargeWindow( connectionListPane.populate(datasourceManager);
SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this), new DialogActionAdapter() { final BasicDialog connectionListDialog = connectionListPane.showLargeWindow(
public void doOk() { SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this), null);
connectionListPane.update(datasourceManager); connectionListDialog.addDialogActionListener(new DialogActionAdapter() {
// marks:保存数据 public void doOk() {
Env currentEnv = FRContext.getCurrentEnv(); if (!connectionListPane.isNamePermitted()) {
try { connectionListDialog.setDoOKSucceed(false);
currentEnv.writeResource(datasourceManager); return;
} catch (Exception ex) { }
FRContext.getLogger().error(ex.getMessage(), ex); if (!ConnectionListAction.doWithDatasourceManager(datasourceManager, backupManager, connectionListPane,
} connectionListDialog)) {
} //如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面
}); return;
connectionListDialog.setVisible(true); }
refreshItems(); // marks:保存数据
} ConnectionListAction.writeFile(datasourceManager);
}
public void populate(com.fr.data.impl.Connection connection) {
editButton.setEnabled(FRContext.getCurrentEnv().isRoot()); public void doCancel() {
if (connection instanceof NameDatabaseConnection) { datasourceManager.synchronizedWithServer();
this.setSelectedItem(((NameDatabaseConnection) connection).getName()); }
} else { });
String s = DesignerEnvManager.getEnvManager().getRecentSelectedConnection(); connectionListDialog.setVisible(true);
if (StringUtils.isNotBlank(s)) { refreshItems();
for (int i = 0; i < this.getConnectionSize(); i++) { }
String t = this.getConnection(i);
if (ComparatorUtils.equals(s, t)) { /**
this.setSelectedItem(s); * @param connection 数据库链接
break; */
} public void populate(Connection connection) {
} editButton.setEnabled(FRContext.getCurrentEnv().isRoot());
} if (connection instanceof NameDatabaseConnection) {
// alex:如果这个ComboBox还是没有选中,那么选中第一个 this.setSelectedItem(((NameDatabaseConnection) connection).getName());
if (StringUtils.isBlank(this.getSelectedItem()) && this.getConnectionSize() > 0) { } else {
this.setSelectedItem(this.getConnection(0)); String s = DesignerEnvManager.getEnvManager().getRecentSelectedConnection();
} if (StringUtils.isNotBlank(s)) {
} for (int i = 0; i < this.getConnectionSize(); i++) {
} String t = this.getConnection(i);
if (ComparatorUtils.equals(s, t)) {
this.setSelectedItem(s);
break;
}
}
}
// alex:如果这个ComboBox还是没有选中,那么选中第一个
if (StringUtils.isBlank(this.getSelectedItem()) && this.getConnectionSize() > 0) {
this.setSelectedItem(this.getConnection(0));
}
}
}
} }

324
designer_base/src/com/fr/design/data/datapane/connect/ConnectionListPane.java
Unescape View File

@ -1,163 +1,163 @@
package com.fr.design.data.datapane.connect; package com.fr.design.data.datapane.connect;
import com.fr.data.impl.Connection; import com.fr.data.impl.Connection;
import com.fr.data.impl.JDBCDatabaseConnection; import com.fr.data.impl.JDBCDatabaseConnection;
import com.fr.data.impl.JNDIDatabaseConnection; import com.fr.data.impl.JNDIDatabaseConnection;
import com.fr.design.ExtraDesignClassManager; import com.fr.design.ExtraDesignClassManager;
import com.fr.design.fun.ConnectionProvider; import com.fr.design.fun.ConnectionProvider;
import com.fr.design.gui.controlpane.JListControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.file.DatasourceManagerProvider; import com.fr.file.DatasourceManagerProvider;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.general.NameObject; import com.fr.general.NameObject;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
import com.fr.stable.Nameable; import com.fr.stable.Nameable;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.stable.core.PropertyChangeAdapter; import com.fr.stable.core.PropertyChangeAdapter;
import javax.swing.*; import javax.swing.*;
import java.util.*; import java.util.*;
/** /**
* Connection List Pane. * Connection List Pane.
*/ */
public class ConnectionListPane extends JListControlPane { public class ConnectionListPane extends JListControlPane implements ConnectionShowPane {
public static final String TITLE_NAME = Inter.getLocText("Server-Define_Data_Connection"); public static final String TITLE_NAME = Inter.getLocText("Server-Define_Data_Connection");
private boolean isNamePermitted = true; private boolean isNamePermitted = true;
private HashMap<String, String> renameMap = new HashMap<String, String>(); private HashMap<String, String> renameMap = new HashMap<String, String>();
public ConnectionListPane() { public ConnectionListPane() {
renameMap.clear(); renameMap.clear();
this.addEditingListner(new PropertyChangeAdapter() { this.addEditingListner(new PropertyChangeAdapter() {
public void propertyChange() { public void propertyChange() {
isNamePermitted = true; isNamePermitted = true;
String[] allListNames = nameableList.getAllNames(); String[] allListNames = nameableList.getAllNames();
allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY; allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY;
String tempName = getEditingName(); String tempName = getEditingName();
if (StringUtils.isEmpty(tempName)) { if (StringUtils.isEmpty(tempName)) {
String[] warning = new String[]{"NOT_NULL_Des", "Please_Rename"}; String[] warning = new String[]{"NOT_NULL_Des", "Please_Rename"};
String[] sign = new String[]{",", "!"}; String[] sign = new String[]{",", "!"};
nameableList.stopEditing(); nameableList.stopEditing();
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), Inter.getLocText(warning, sign)); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), Inter.getLocText(warning, sign));
setWarnigText(editingIndex); setWarnigText(editingIndex);
isNamePermitted = false; isNamePermitted = false;
return; return;
} }
if (!ComparatorUtils.equals(tempName, selectedName) if (!ComparatorUtils.equals(tempName, selectedName)
&& isNameRepeted(new List[]{Arrays.asList(allListNames)}, tempName)) { && isNameRepeted(new List[]{Arrays.asList(allListNames)}, tempName)) {
isNamePermitted = false; isNamePermitted = false;
nameableList.stopEditing(); nameableList.stopEditing();
String message = Inter.getLocText(new String[]{"Utils-has_been_existed", "DashBoard-ConnectionList", "Please_Rename"}, new String[]{"", tempName + ",", "!"}); String message = Inter.getLocText(new String[]{"Utils-has_been_existed", "DashBoard-ConnectionList", "Please_Rename"}, new String[]{"", tempName + ",", "!"});
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message);
setWarnigText(editingIndex); setWarnigText(editingIndex);
} }
if (isNamePermitted && !ComparatorUtils.equals(tempName, selectedName)) { if (isNamePermitted && !ComparatorUtils.equals(tempName, selectedName)) {
rename(selectedName, tempName); rename(selectedName, tempName);
} }
} }
}); });
} }
protected void rename(String oldName, String newName) { protected void rename(String oldName, String newName) {
if (renameMap.containsKey(selectedName)) { if (renameMap.containsKey(selectedName)) {
renameMap.remove(selectedName); renameMap.remove(selectedName);
} }
renameMap.put(selectedName, newName); renameMap.put(selectedName, newName);
} }
/** /**
* 名字是否允许 * 名字是否允许
* *
* @return 是/否 * @return 是/否
*/ */
public boolean isNamePermitted() { public boolean isNamePermitted() {
return isNamePermitted; return isNamePermitted;
} }
/** /**
* 检查按钮可用状态 Check button enabled. * 检查按钮可用状态 Check button enabled.
*/ */
public void checkButtonEnabled() { public void checkButtonEnabled() {
super.checkButtonEnabled(); super.checkButtonEnabled();
isNamePermitted = !isContainsRename(); isNamePermitted = !isContainsRename();
} }
public HashMap<String, String> getRenameMap() { public HashMap<String, String> getRenameMap() {
return renameMap; return renameMap;
} }
/** /**
* 创建菜单项 * 创建菜单项
* *
* @return 菜单项 * @return 菜单项
*/ */
public NameableCreator[] createNameableCreators() { public NameableCreator[] createNameableCreators() {
NameableCreator[] creators = new NameableCreator[]{new NameObjectCreator( NameableCreator[] creators = new NameableCreator[]{new NameObjectCreator(
"JDBC", "JDBC",
"/com/fr/design/images/data/source/jdbcTableData.png", "/com/fr/design/images/data/source/jdbcTableData.png",
JDBCDatabaseConnection.class, JDBCDatabaseConnection.class,
DatabaseConnectionPane.JDBC.class DatabaseConnectionPane.JDBC.class
), new NameObjectCreator( ), new NameObjectCreator(
"JNDI", "JNDI",
"/com/fr/design/images/data/source/jdbcTableData.png", "/com/fr/design/images/data/source/jdbcTableData.png",
JNDIDatabaseConnection.class, JNDIDatabaseConnection.class,
DatabaseConnectionPane.JNDI.class DatabaseConnectionPane.JNDI.class
)}; )};
Set<ConnectionProvider> pluginCreators = ExtraDesignClassManager.getInstance().getArray(ConnectionProvider.XML_TAG); Set<ConnectionProvider> pluginCreators = ExtraDesignClassManager.getInstance().getArray(ConnectionProvider.XML_TAG);
for (ConnectionProvider provider : pluginCreators) { for (ConnectionProvider provider : pluginCreators) {
NameObjectCreator creator = new NameObjectCreator( NameObjectCreator creator = new NameObjectCreator(
provider.nameForConnection(), provider.nameForConnection(),
provider.iconPathForConnection(), provider.iconPathForConnection(),
provider.classForConnection(), provider.classForConnection(),
provider.appearanceForConnection() provider.appearanceForConnection()
); );
creators = ArrayUtils.add(creators, creator); creators = ArrayUtils.add(creators, creator);
} }
return creators; return creators;
} }
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return TITLE_NAME; return TITLE_NAME;
} }
/** /**
* Populate. * Populate.
* *
* @param datasourceManager the new datasourceManager. * @param datasourceManager the new datasourceManager.
*/ */
public void populate(DatasourceManagerProvider datasourceManager) { public void populate(DatasourceManagerProvider datasourceManager) {
Iterator<String> nameIt = datasourceManager.getConnectionNameIterator(); Iterator<String> nameIt = datasourceManager.getConnectionNameIterator();
List<NameObject> nameObjectList = new ArrayList<NameObject>(); List<NameObject> nameObjectList = new ArrayList<NameObject>();
while (nameIt.hasNext()) { while (nameIt.hasNext()) {
String name = nameIt.next(); String name = nameIt.next();
nameObjectList.add(new NameObject(name, datasourceManager.getConnection(name))); nameObjectList.add(new NameObject(name, datasourceManager.getConnection(name)));
} }
this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()])); this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()]));
} }
/** /**
* Update. * Update.
*/ */
public void update(DatasourceManagerProvider datasourceManager) { public void update(DatasourceManagerProvider datasourceManager) {
// Nameable[]居然不能强转成NameObject[],一定要这么写... // Nameable[]居然不能强转成NameObject[],一定要这么写...
Nameable[] res = this.update(); Nameable[] res = this.update();
NameObject[] res_array = new NameObject[res.length]; NameObject[] res_array = new NameObject[res.length];
java.util.Arrays.asList(res).toArray(res_array); java.util.Arrays.asList(res).toArray(res_array);
datasourceManager.clearAllConnection(); datasourceManager.clearAllConnection();
for (int i = 0; i < res_array.length; i++) { for (int i = 0; i < res_array.length; i++) {
NameObject nameObject = res_array[i]; NameObject nameObject = res_array[i];
datasourceManager.putConnection(nameObject.getName(), (Connection) nameObject.getObject()); datasourceManager.putConnection(nameObject.getName(), (Connection) nameObject.getObject());
} }
} }
} }

155
designer_base/src/com/fr/design/data/datapane/connect/ConnectionManagerPane.java
Unescape View File

@ -1,78 +1,79 @@
package com.fr.design.data.datapane.connect; package com.fr.design.data.datapane.connect;
import com.fr.base.FRContext; import com.fr.base.FRContext;
import com.fr.design.gui.frpane.LoadingBasicPane; import com.fr.design.gui.frpane.LoadingBasicPane;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.file.DatasourceManagerProvider; import com.fr.file.DatasourceManagerProvider;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.stable.project.ProjectConstants; import com.fr.stable.project.ProjectConstants;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.io.File; import java.io.File;
import java.util.HashMap; import java.util.HashMap;
public class ConnectionManagerPane extends LoadingBasicPane { public class ConnectionManagerPane extends LoadingBasicPane implements ConnectionShowPane {
private UITextField connectionTextField; private UITextField connectionTextField;
private ConnectionListPane connectionListPane; private ConnectionListPane connectionListPane;
protected void initComponents(JPanel container) { protected void initComponents(JPanel container) {
container.setLayout(FRGUIPaneFactory.createBorderLayout()); container.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel connectionPathPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); JPanel connectionPathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
container.add(connectionPathPane, BorderLayout.NORTH); container.add(connectionPathPane, BorderLayout.NORTH);
connectionPathPane.setBorder(BorderFactory.createEmptyBorder(6, 2, 2, 2)); connectionPathPane.setBorder(BorderFactory.createEmptyBorder(6, 2, 2, 2));
connectionPathPane.add(new UILabel(Inter.getLocText("FR-Designer_Save_Path") + ":"), BorderLayout.WEST); connectionPathPane.add(new UILabel(Inter.getLocText("FR-Designer_Save_Path") + ":"), BorderLayout.WEST);
this.connectionTextField = new UITextField(); this.connectionTextField = new UITextField();
connectionPathPane.add(connectionTextField, BorderLayout.CENTER); connectionPathPane.add(connectionTextField, BorderLayout.CENTER);
this.connectionTextField.setEditable(false); this.connectionTextField.setEditable(false);
connectionListPane = new ConnectionListPane(){ connectionListPane = new ConnectionListPane() {
protected void rename(String oldName,String newName) { protected void rename(String oldName, String newName) {
super.rename(oldName,newName); super.rename(oldName, newName);
renameConnection(oldName,newName); renameConnection(oldName, newName);
} }
}; };
container.add(connectionListPane, BorderLayout.CENTER); container.add(connectionListPane, BorderLayout.CENTER);
} }
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return Inter.getLocText("Server-Define_Data_Connection"); return Inter.getLocText("Server-Define_Data_Connection");
} }
public HashMap<String, String> getRenameMap() { public HashMap<String, String> getRenameMap() {
return connectionListPane.getRenameMap(); return connectionListPane.getRenameMap();
} }
public void populate(DatasourceManagerProvider datasourceManager) { public void populate(DatasourceManagerProvider datasourceManager) {
this.connectionTextField.setText(FRContext.getCurrentEnv().getPath() + File.separator + ProjectConstants.RESOURCES_NAME this.connectionTextField.setText(FRContext.getCurrentEnv().getPath() + File.separator + ProjectConstants.RESOURCES_NAME
+ File.separator + datasourceManager.fileName()); + File.separator + datasourceManager.fileName());
this.connectionListPane.populate(datasourceManager); this.connectionListPane.populate(datasourceManager);
} }
public void update(DatasourceManagerProvider datasourceManager) { public void update(DatasourceManagerProvider datasourceManager) {
this.connectionListPane.update(datasourceManager); this.connectionListPane.update(datasourceManager);
} }
/** /**
* 设置选中项 * 设置选中项
* *
* @param index 选中项的序列号 * @param index 选中项的序列号
*/ */
public void setSelectedIndex(int index) { public void setSelectedIndex(int index) {
this.connectionListPane.setSelectedIndex(index); this.connectionListPane.setSelectedIndex(index);
} }
/** /**
* 名字是否允许 * 名字是否允许
* @return 允许返回true *
*/ * @return 允许返回true
public boolean isNamePermitted() { */
return connectionListPane.isNamePermitted(); public boolean isNamePermitted() {
} return connectionListPane.isNamePermitted();
}
} }

15
designer_base/src/com/fr/design/data/datapane/connect/ConnectionShowPane.java
Unescape View File

@ -0,0 +1,15 @@
package com.fr.design.data.datapane.connect;
import com.fr.file.DatasourceManagerProvider;
/**
* Created by yaoh.wu on 2017/4/22.
* 数据链接显示面板
*/
public interface ConnectionShowPane {
void update(DatasourceManagerProvider datasourceManager);
void populate(DatasourceManagerProvider datasourceManager);
void setSelectedIndex(int index);
}

33
designer_form/src/com/fr/design/mainframe/FormSelectionUtils.java
Unescape View File

@ -132,29 +132,18 @@ public class FormSelectionUtils {
XLayoutContainer container = layoutAdapter.getContainer(); XLayoutContainer container = layoutAdapter.getContainer();
boolean xOut = x < 0 || x + copiedCreator.getWidth() / 2 + xoffset > container.getWidth(); boolean xOut = x < 0 || x + copiedCreator.getWidth() / 2 + xoffset > container.getWidth();
boolean yOut = y < 0 || y + copiedCreator.getHeight() / 2 + yoffset > container.getHeight(); boolean yOut = y < 0 || y + copiedCreator.getHeight() / 2 + yoffset > container.getHeight();
/*
* 组件原始位置位于布局的右下角， y = yOut ? container.getHeight() - copiedCreator.getHeight() / 2 - yoffset : y;
* 和布局右下边界线紧挨， boolean isEdge = (x - DELAY_X_Y == container.getWidth() - copiedCreator.getWidth() / 2 - xoffset);
* 粘贴时组件在原始位置向左错开20像素。 if (xOut) {
* x,y同时越界 if (isEdge) {
*/ //向左偏移
if (xOut && yOut) { x = container.getWidth() - copiedCreator.getWidth() / 2 - DELAY_X_Y - xoffset;
//向左偏移 }
x = container.getWidth() - copiedCreator.getWidth() / 2 - DELAY_X_Y - xoffset;
//紧贴下边界 //紧贴下边界
y = container.getHeight() - copiedCreator.getHeight() / 2 - yoffset; else {
return new Point(x, y); x = container.getWidth() - copiedCreator.getWidth() / 2 - xoffset;
} }
/*
* 组件原始位置与布局边界距离小于20像素（下边界&右边界同时小于或者任意一个边界小于），
* 则粘贴时距离小于20像素一侧直接贴近布局边界，
* 距离大于20像素的一侧正常错开。
* x,y中只有一个越界
*/
if ((xOut || yOut)) {
x = xOut ? container.getWidth() - copiedCreator.getWidth() / 2 - xoffset : x;
y = yOut ? container.getHeight() - copiedCreator.getHeight() / 2 - yoffset : y;
return new Point(x, y);
} }
} }
return new Point(x, y); return new Point(x, y);

Write Preview
Loading…
Cancel
Save