Browse Source

改名字

pull/1/head
richie 5 years ago
parent
commit
3eb3d2a88d
  1. 2
      src/main/java/com/fanruan/api/design/macro/DataSourceConstants.java
  2. 4
      src/main/java/com/fanruan/api/design/work/AbstractTableDataPane.java
  3. 14
      src/main/java/com/fanruan/api/design/work/BaseTableDataPane.java
  4. 6
      src/main/java/com/fanruan/api/design/work/ConnectionComboBoxPanel.java

2
src/main/java/com/fanruan/api/design/macro/DatasourceConstants.java → src/main/java/com/fanruan/api/design/macro/DataSourceConstants.java

@ -7,7 +7,7 @@ import com.fr.design.gui.NameInspector;
* @version 10.0 * @version 10.0
* Created by richie on 2019/9/24 * Created by richie on 2019/9/24
*/ */
public class DatasourceConstants { public class DataSourceConstants {
public static final String ILLEGAL_NAME_HOLDER = NameInspector.ILLEGAL_NAME_HOLDER; public static final String ILLEGAL_NAME_HOLDER = NameInspector.ILLEGAL_NAME_HOLDER;
} }

4
src/main/java/com/fanruan/api/design/work/AbstractTableDataPane.java

@ -7,6 +7,8 @@ import com.fr.base.TableData;
* @version 10.0 * @version 10.0
* Created by richie on 2019-08-30 * Created by richie on 2019-08-30
* 数据插件继承此抽象类 * 数据插件继承此抽象类
* @see com.fanruan.api.design.work.BaseTableDataPane
*/ */
public abstract class AbstractTableDataPane<T extends TableData> extends com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane<T> { @Deprecated
public abstract class AbstractTableDataPane<T extends TableData> extends BaseTableDataPane<T> {
} }

14
src/main/java/com/fanruan/api/design/work/BaseTableDataPane.java

@ -0,0 +1,14 @@
package com.fanruan.api.design.work;
import com.fr.base.TableData;
import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane;
/**
* @author richie
* @version 10.0
* Created by richie on 2019/9/24
* 数据插件界面实现类都继承此抽象类
*/
public abstract class BaseTableDataPane<T extends TableData> extends AbstractTableDataPane<T> {
}

6
src/main/java/com/fanruan/api/design/work/ConnectionComboBoxPanel.java

@ -4,7 +4,7 @@ import com.fanruan.api.conf.ConfigurationKit;
import com.fanruan.api.data.ConnectionKit; import com.fanruan.api.data.ConnectionKit;
import com.fanruan.api.data.open.BaseConnection; import com.fanruan.api.data.open.BaseConnection;
import com.fanruan.api.design.DesignKit; import com.fanruan.api.design.DesignKit;
import com.fanruan.api.design.macro.DatasourceConstants; import com.fanruan.api.design.macro.DataSourceConstants;
import com.fanruan.api.generic.Runner; import com.fanruan.api.generic.Runner;
import com.fanruan.api.util.AssistKit; import com.fanruan.api.util.AssistKit;
import com.fanruan.api.util.StringKit; import com.fanruan.api.util.StringKit;
@ -171,8 +171,8 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
private int isConnectionMapContainsRename(ConnectionConfig datasourceManager) { private int isConnectionMapContainsRename(ConnectionConfig datasourceManager) {
Map<String, Connection> tableDataMap = datasourceManager.getConnections(); Map<String, Connection> tableDataMap = datasourceManager.getConnections();
if (tableDataMap.containsKey(DatasourceConstants.ILLEGAL_NAME_HOLDER)) { if (tableDataMap.containsKey(DataSourceConstants.ILLEGAL_NAME_HOLDER)) {
return datasourceManager.getConnectionIndex(DatasourceConstants.ILLEGAL_NAME_HOLDER); return datasourceManager.getConnectionIndex(DataSourceConstants.ILLEGAL_NAME_HOLDER);
} }
return -1; return -1;
} }

Loading…
Cancel
Save