fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #66 in DESIGN/design from ~HZZZ/design61:feature/10.0 to feature/10.0 

* commit '3d9fdb15afba15d0467a1bc7cd37f6b198f5dbd8':
  fix
master
superman 7 years ago
parent
54870097f4 3d9fdb15af
commit
043afd92df
9 changed files with 19 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      designer-base/src/com/fr/design/DesignerEnvManager.java
  2. 4
      designer-base/src/com/fr/design/actions/file/SwitchExistEnv.java
  3. 2
      designer-base/src/com/fr/design/mainframe/DesignerFrame.java
  4. 4
      designer-base/src/com/fr/design/mainframe/loghandler/socketio/DesignerSocketIO.java
  5. 4
      designer-base/src/com/fr/env/EnvListPane.java
  6. 3
      designer-base/src/com/fr/env/LocalEnvPane.java
  7. 6
      designer-base/src/com/fr/env/RemoteEnv.java
  8. 4
      designer-base/src/com/fr/env/RemoteEnvPane.java
  9. 6
      designer-base/src/com/fr/env/SignIn.java

6
designer-base/src/com/fr/design/DesignerEnvManager.java
Unescape View File

@ -6,10 +6,10 @@ package com.fr.design;
import com.fr.base.BaseXMLUtils;
import com.fr.base.FRContext;
import com.fr.base.Utils;
import com.fr.base.env.resource.EnvConfigUtils;
import com.fr.base.env.resource.LocalEnvConfig;
import com.fr.base.env.resource.RemoteEnvConfig;
import com.fr.core.env.EnvConfig;
import com.fr.core.env.resource.EnvConfigUtils;
import com.fr.core.env.resource.LocalEnvConfig;
import com.fr.core.env.resource.RemoteEnvConfig;
import com.fr.design.actions.help.alphafine.AlphaFineConfigManager;
import com.fr.design.constants.UIConstants;
import com.fr.env.SignIn;

4
designer-base/src/com/fr/design/actions/file/SwitchExistEnv.java
Unescape View File

@ -1,9 +1,9 @@
package com.fr.design.actions.file;
import com.fr.base.BaseUtils;
import com.fr.base.env.resource.LocalEnvConfig;
import com.fr.base.env.resource.RemoteEnvConfig;
import com.fr.core.env.EnvConfig;
import com.fr.core.env.resource.LocalEnvConfig;
import com.fr.core.env.resource.RemoteEnvConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.UpdateAction;
import com.fr.design.data.DesignTableDataManager;

2
designer-base/src/com/fr/design/mainframe/DesignerFrame.java
Unescape View File

@ -6,8 +6,8 @@ package com.fr.design.mainframe;
import com.fr.base.BaseUtils;
import com.fr.base.Env;
import com.fr.base.FRContext;
import com.fr.base.env.resource.EnvConfigUtils;
import com.fr.core.env.EnvConfig;
import com.fr.core.env.resource.EnvConfigUtils;
import com.fr.design.DesignModelAdapter;
import com.fr.design.DesignState;
import com.fr.design.DesignerEnvManager;

4
designer-base/src/com/fr/design/mainframe/loghandler/socketio/DesignerSocketIO.java
Unescape View File

@ -1,10 +1,10 @@
package com.fr.design.mainframe.loghandler.socketio;
import com.fr.base.env.EnvContext;
import com.fr.base.env.resource.LocalEnvConfig;
import com.fr.core.env.EnvConfig;
import com.fr.core.env.EnvConstants;
import com.fr.core.env.EnvContext;
import com.fr.core.env.EnvEvent;
import com.fr.core.env.resource.LocalEnvConfig;
import com.fr.decision.webservice.utils.DecisionServiceConstants;
import com.fr.design.mainframe.loghandler.DesignerLogHandler;
import com.fr.event.Event;

4
designer-base/src/com/fr/env/EnvListPane.java vendored
Unescape View File

@ -1,8 +1,8 @@
package com.fr.env;
import com.fr.base.env.resource.LocalEnvConfig;
import com.fr.base.env.resource.RemoteEnvConfig;
import com.fr.core.env.EnvConfig;
import com.fr.core.env.resource.LocalEnvConfig;
import com.fr.core.env.resource.RemoteEnvConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator;

3
designer-base/src/com/fr/env/LocalEnvPane.java vendored
Unescape View File

@ -1,7 +1,6 @@
package com.fr.env;
import com.fr.base.env.resource.LocalEnvConfig;
import com.fr.dav.LocalEnv;
import com.fr.core.env.resource.LocalEnvConfig;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextarea.UITextArea;

6
designer-base/src/com/fr/env/RemoteEnv.java vendored
Unescape View File

@ -1,15 +1,15 @@
package com.fr.env;
import com.fr.base.env.old.AbstractEnv;
import com.fr.base.EnvException;
import com.fr.base.TableData;
import com.fr.base.env.EnvContext;
import com.fr.base.env.resource.RemoteEnvConfig;
import com.fr.base.remote.RemoteDeziConstants;
import com.fr.core.env.EnvConstants;
import com.fr.core.env.EnvContext;
import com.fr.core.env.resource.RemoteEnvConfig;
import com.fr.data.TableDataSource;
import com.fr.data.impl.EmbeddedTableData;
import com.fr.data.impl.storeproc.StoreProcedure;
import com.fr.dav.AbstractEnv;
import com.fr.dav.DavXMLUtils;
import com.fr.design.DesignerEnvManager;
import com.fr.design.mainframe.DesignerContext;

4
designer-base/src/com/fr/env/RemoteEnvPane.java vendored
Unescape View File

@ -1,8 +1,8 @@
package com.fr.env;
import com.fr.base.FRContext;
import com.fr.base.env.resource.EnvConfigUtils;
import com.fr.base.env.resource.RemoteEnvConfig;
import com.fr.core.env.resource.EnvConfigUtils;
import com.fr.core.env.resource.RemoteEnvConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.border.UITitledBorder;

6
designer-base/src/com/fr/env/SignIn.java vendored
Unescape View File

@ -2,11 +2,11 @@ package com.fr.env;
import com.fr.base.FRContext;
import com.fr.base.env.EnvContext;
import com.fr.base.env.resource.EnvConfigUtils;
import com.fr.base.env.resource.RemoteEnvConfig;
import com.fr.core.env.EnvConfig;
import com.fr.core.env.EnvContext;
import com.fr.core.env.EnvEvent;
import com.fr.core.env.resource.EnvConfigUtils;
import com.fr.core.env.resource.RemoteEnvConfig;
import com.fr.dav.LocalEnv;
import com.fr.design.utils.DesignUtils;
import com.fr.event.Event;

Write Preview
Loading…
Cancel
Save