Browse Source

Pull request #12104: REPORT-93508 conf整理

Merge in DESIGN/design from ~BRYANT/design:research/11.0 to research/11.0

* commit '2223982ce90b6f708f5574bcc8c143110d55ff27':
  REPORT-93508 conf整理
research/11.0
Bryant-赵东升 2 years ago
parent
commit
0eb3a0c7d4
  1. 2
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
  3. 2
      designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
  4. 6
      designer-realize/src/main/java/com/fr/start/module/optimized/ConfigurationActivator4Designer.java

2
designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java

@ -2,7 +2,7 @@ package com.fr.design.data.datapane;
import com.fr.base.TableData; import com.fr.base.TableData;
import com.fr.base.TableDataBean; import com.fr.base.TableDataBean;
import com.fr.config.RemoteConfigEvent; import com.fr.config.remote.RemoteConfigEvent;
import com.fr.data.MultiResultTableData; import com.fr.data.MultiResultTableData;
import com.fr.data.TableDataSource; import com.fr.data.TableDataSource;
import com.fr.design.data.BasicTableDataUtils; import com.fr.design.data.BasicTableDataUtils;

2
designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java

@ -1,6 +1,6 @@
package com.fr.design.data.datapane.connect; package com.fr.design.data.datapane.connect;
import com.fr.config.RemoteConfigEvent; import com.fr.config.remote.RemoteConfigEvent;
import com.fr.data.driver.DriverClassNotFoundException; import com.fr.data.driver.DriverClassNotFoundException;
import com.fr.data.impl.Connection; import com.fr.data.impl.Connection;
import com.fr.data.impl.ConnectionBean; import com.fr.data.impl.ConnectionBean;

2
designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java

@ -1,6 +1,6 @@
package com.fr.design.mainframe.socketio; package com.fr.design.mainframe.socketio;
import com.fr.config.RemoteConfigEvent; import com.fr.config.remote.RemoteConfigEvent;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.EnvChangeEntrance; import com.fr.design.EnvChangeEntrance;
import com.fr.design.dialog.FineJOptionPane; import com.fr.design.dialog.FineJOptionPane;

6
designer-realize/src/main/java/com/fr/start/module/optimized/ConfigurationActivator4Designer.java

@ -3,9 +3,9 @@ package com.fr.start.module.optimized;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.config.dao.DaoContext; import com.fr.config.dao.DaoContext;
import com.fr.config.dao.DaoSelectorFactory; import com.fr.config.dao.DaoSelectorFactory;
import com.fr.config.dao.impl.PropertiesClassHelperDao; import com.fr.config.dao.impl.remote.PropertiesClassHelperDao;
import com.fr.config.dao.impl.PropertiesEntityDao; import com.fr.config.dao.impl.remote.PropertiesEntityDao;
import com.fr.config.dao.impl.PropertiesXmlEntityDao; import com.fr.config.dao.impl.remote.PropertiesXmlEntityDao;
/** /**
* @author hades * @author hades

Loading…
Cancel
Save