Skip to content

Commit

Permalink
Change name of constant to config instead of groovy
Browse files Browse the repository at this point in the history
  • Loading branch information
Emil Forslund committed Jan 11, 2016
1 parent dba39b4 commit 0bd5e5e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion src/main/java/com/speedment/internal/ui/MainApp.java
Expand Up @@ -32,6 +32,8 @@
import javafx.application.Application; import javafx.application.Application;
import static javafx.application.Application.launch; import static javafx.application.Application.launch;
import javafx.stage.Stage; import javafx.stage.Stage;
import static java.util.Objects.requireNonNull;
import static javafx.application.Application.launch;


/** /**
* *
Expand All @@ -58,7 +60,7 @@ public void start(Stage stage) throws Exception {
final Parameters parameters = getParameters(); final Parameters parameters = getParameters();
final List<String> params = parameters.getRaw(); final List<String> params = parameters.getRaw();
if (params.isEmpty()) { if (params.isEmpty()) {
final UISession session = createSession(stage, UISession.DEFAULT_GROOVY_LOCATION); final UISession session = createSession(stage, UISession.DEFAULT_CONFIG_LOCATION);


if (EmailUtil.hasEmail()) { if (EmailUtil.hasEmail()) {
ConnectController.createAndShow(session); ConnectController.createAndShow(session);
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/speedment/internal/ui/UISession.java
Expand Up @@ -32,7 +32,6 @@
import static com.speedment.internal.ui.UISession.ReuseStage.CREATE_A_NEW_STAGE; import static com.speedment.internal.ui.UISession.ReuseStage.CREATE_A_NEW_STAGE;
import com.speedment.internal.ui.config.DbmsProperty; import com.speedment.internal.ui.config.DbmsProperty;
import com.speedment.internal.ui.config.DocumentProperty; import com.speedment.internal.ui.config.DocumentProperty;
import com.speedment.internal.ui.config.SchemaProperty;
import com.speedment.internal.ui.controller.ConnectController; import com.speedment.internal.ui.controller.ConnectController;
import com.speedment.internal.ui.controller.SceneController; import com.speedment.internal.ui.controller.SceneController;
import static com.speedment.internal.ui.util.OutputUtil.error; import static com.speedment.internal.ui.util.OutputUtil.error;
Expand Down Expand Up @@ -79,7 +78,7 @@
*/ */
public final class UISession { public final class UISession {


public final static String DEFAULT_GROOVY_LOCATION = "src/main/groovy/speedment.groovy"; public final static String DEFAULT_CONFIG_LOCATION = "src/main/groovy/speedment.groovy";


public enum ReuseStage { public enum ReuseStage {
USE_EXISTING_STAGE, USE_EXISTING_STAGE,
Expand Down
Expand Up @@ -44,6 +44,7 @@
import static com.speedment.internal.ui.UISession.ReuseStage.USE_EXISTING_STAGE; import static com.speedment.internal.ui.UISession.ReuseStage.USE_EXISTING_STAGE;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
import org.controlsfx.glyphfont.FontAwesome; import org.controlsfx.glyphfont.FontAwesome;
import static java.util.Objects.requireNonNull;


/** /**
* *
Expand Down

0 comments on commit 0bd5e5e

Please sign in to comment.