Browse Source

拼写错误

master
eason-skx 8 years ago
parent
commit
ae6cda2ff8
  1. 2
      designer_base/src/com/fr/design/actions/help/WebDemoAction.java
  2. 4
      designer_base/src/com/fr/design/utils/DesignUtils.java
  3. 2
      designer_base/src/com/fr/start/BaseDesigner.java
  4. 12
      designer_base/src/com/fr/start/StartServer.java
  5. 2
      designer_chart/src/com/fr/design/mainframe/actions/ChartWebAction.java

2
designer_base/src/com/fr/design/actions/help/WebDemoAction.java

@ -23,7 +23,7 @@ public class WebDemoAction extends UpdateAction {
* @param evt 事件 * @param evt 事件
*/ */
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
StartServer.browerDemoURL(); StartServer.browserDemoURL();
} }
public static final MenuKeySet PRODUCT_DEMO = new MenuKeySet() { public static final MenuKeySet PRODUCT_DEMO = new MenuKeySet() {

4
designer_base/src/com/fr/design/utils/DesignUtils.java

@ -112,7 +112,7 @@ public class DesignUtils {
String line = null; String line = null;
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
if (line.startsWith("demo")) { if (line.startsWith("demo")) {
StartServer.browerDemoURL(); StartServer.browserDemoURL();
} else if (StringUtils.isNotEmpty(line)) { } else if (StringUtils.isNotEmpty(line)) {
File f = new File(line); File f = new File(line);
String path = f.getAbsolutePath(); String path = f.getAbsolutePath();
@ -315,7 +315,7 @@ public class DesignUtils {
String web = GeneralContext.getCurrentAppNameOfEnv(); String web = GeneralContext.getCurrentAppNameOfEnv();
String url = "http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + ConfigManager.getProviderInstance().getServletMapping() String url = "http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + ConfigManager.getProviderInstance().getServletMapping()
+ postfixOfUri; + postfixOfUri;
StartServer.browerURLWithLocalEnv(url); StartServer.browserURLWithLocalEnv(url);
} catch (Throwable e) { } catch (Throwable e) {
// //
} }

2
designer_base/src/com/fr/start/BaseDesigner.java

@ -71,7 +71,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
for (String arg : args) { for (String arg : args) {
if (ComparatorUtils.equals(arg, "demo")) { if (ComparatorUtils.equals(arg, "demo")) {
DesignerEnvManager.getEnvManager().setCurrentEnv2Default(); DesignerEnvManager.getEnvManager().setCurrentEnv2Default();
StartServer.browerDemoURL(); StartServer.browserDemoURL();
break; break;
} }
} }

12
designer_base/src/com/fr/start/StartServer.java

@ -45,10 +45,10 @@ public class StartServer {
* 预览Demo * 预览Demo
* 找默认工作目录不应该按照名字去找而应该按照安装路径因为默认工作目录的名字可能会改变 * 找默认工作目录不应该按照名字去找而应该按照安装路径因为默认工作目录的名字可能会改变
*/ */
public static void browerDemoURL() { public static void browserDemoURL() {
if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用 if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用
String web = GeneralContext.getCurrentAppNameOfEnv(); String web = GeneralContext.getCurrentAppNameOfEnv();
browerURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + ConfigManager.getProviderInstance().getServletMapping() browserURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + ConfigManager.getProviderInstance().getServletMapping()
+ "?op=fs"); + "?op=fs");
return; return;
} }
@ -65,16 +65,16 @@ public class StartServer {
} catch (Exception e) { } catch (Exception e) {
FRContext.getLogger().errorWithServerLevel(e.getMessage()); FRContext.getLogger().errorWithServerLevel(e.getMessage());
} }
initDemoServerAndBrower(); initDemoServerAndBrowser();
} }
}).setVisible(true); }).setVisible(true);
} else { } else {
initDemoServerAndBrower(); initDemoServerAndBrowser();
} }
} }
private static void initDemoServerAndBrower() { private static void initDemoServerAndBrowser() {
if (jettyHost != null) { if (jettyHost != null) {
if (!jettyHost.isDemoAppLoaded()) { if (!jettyHost.isDemoAppLoaded()) {
jettyHost.exit(); jettyHost.exit();
@ -104,7 +104,7 @@ public class StartServer {
* *
* @param url 指定路径 * @param url 指定路径
*/ */
public static void browerURLWithLocalEnv(String url) { public static void browserURLWithLocalEnv(String url) {
try { try {
if (jettyHost != null) { if (jettyHost != null) {
if (NEED_LOAD_ENV) { if (NEED_LOAD_ENV) {

2
designer_chart/src/com/fr/design/mainframe/actions/ChartWebAction.java

@ -50,7 +50,7 @@ public class ChartWebAction extends UpdateAction {
* @param e 事件 * @param e 事件
*/ */
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
StartServer.browerURLWithLocalEnv("http://www.vancharts.com/demo.html"); StartServer.browserURLWithLocalEnv("http://www.vancharts.com/demo.html");
return; return;
} }
} }
Loading…
Cancel
Save