improve code smell

firm1 · Jan 10, 2017 · 5a487bf · 5a487bf
1 parent 6c64313
commit 5a487bf
Show file tree

Hide file tree

Showing 29 changed files with 176 additions and 194 deletions.
diff --git a/src/main/java/com/zestedesavoir/zestwriter/MainApp.java b/src/main/java/com/zestedesavoir/zestwriter/MainApp.java
@@ -105,6 +105,38 @@ public static void main(String[] args) {
         launch(args);
     }
 
+    public static Configuration getConfig() {
+        return config;
+    }
+
+    public static Stage getPrimaryStage() {
+        return primaryStage;
+    }
+
+    private static void setPrimaryStage(Stage primaryStage) {
+        MainApp.primaryStage = primaryStage;
+    }
+
+    public static ZdsHttp getZdsutils() {
+        return zdsutils;
+    }
+
+    public static File getDefaultHome() {
+        return defaultHome;
+    }
+
+    public static Markdown getMdUtils() {
+        return mdUtils;
+    }
+
+    public static Logger getLogger() {
+        return logger;
+    }
+
+    public static void setLogger(Logger logger) {
+        MainApp.logger = logger;
+    }
+
     private void initEnvVariable() {
         Path logPath;
         Path logDir;
@@ -133,49 +165,18 @@ private void initEnvVariable() {
         System.setProperty("zw.logPath", log.getAbsolutePath());
     }
 
-
-    public static Configuration getConfig() {
-        return config;
-    }
-
-    public static Stage getPrimaryStage() {
-        return primaryStage;
-    }
-
-    public static ZdsHttp getZdsutils() {
-        return zdsutils;
-    }
-
-    public static File getDefaultHome() {
-        return defaultHome;
-    }
-
-    public static Markdown getMdUtils() { return mdUtils; }
-
-    private static void setPrimaryStage(Stage primaryStage) {
-        MainApp.primaryStage = primaryStage;
-    }
-
-    public static Logger getLogger() {
-        return logger;
-    }
-
-    public static void setLogger(Logger logger) {
-        MainApp.logger = logger;
-    }
-
     public Content getContent() {
         return content.get();
     }
 
-    public ObjectProperty<Content> contentProperty() {
-        return content;
-    }
-
     public void setContent(Content content) {
         this.content.set(content);
     }
 
+    public ObjectProperty<Content> contentProperty() {
+        return content;
+    }
+
     @Override
     public void start(Stage primaryStage) {
         setPrimaryStage(primaryStage);
@@ -274,8 +275,8 @@ private void initConnection(){
             LoginService loginTask = new LoginService(config.getAuthentificationUsername(), config.getAuthentificationPassword());
 
             menuController.getMenuDownload().setDisable(true);
-            menuController.gethBottomBox().getChildren().clear();
-            menuController.gethBottomBox().getChildren().addAll(menuController.getLabelField());
+            menuController.getHBottomBox().getChildren().clear();
+            menuController.getHBottomBox().getChildren().addAll(menuController.getLabelField());
             menuController.getLabelField().textProperty().bind(loginTask.messageProperty());
 
             loginTask.setOnCancelled(t -> {
@@ -286,7 +287,7 @@ private void initConnection(){
 
                 alert.showAndWait();
                 menuController.getMenuDownload().setDisable(false);
-                menuController.gethBottomBox().getChildren().clear();
+                menuController.getHBottomBox().getChildren().clear();
             });
 
             loginTask.setOnSucceeded(t -> menuController.getMenuDownload().setDisable(false));

diff --git a/src/main/java/com/zestedesavoir/zestwriter/model/License.java b/src/main/java/com/zestedesavoir/zestwriter/model/License.java
@@ -1,8 +1,8 @@
 package com.zestedesavoir.zestwriter.model;
 
-import lombok.*;
-
-import java.util.Objects;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
 
 @Getter
 @Setter

diff --git a/src/main/java/com/zestedesavoir/zestwriter/model/MetaAttribute.java b/src/main/java/com/zestedesavoir/zestwriter/model/MetaAttribute.java
@@ -39,6 +39,11 @@ public String getTitle() {
         return title;
     }
 
+    @Override
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
     public String getExpandTitle() {
         return getTitle()+" (" + getParent().getTitle() + ")";
     }
@@ -52,11 +57,6 @@ public String getLimitedExpandTitle() {
         }
     }
 
-    @Override
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
     public String getSlug() {
         return _slug.replace("\\", "/");
     }
@@ -104,11 +104,6 @@ public MaterialDesignIconView buildIcon() {
         return IconFactory.createFileBlankIcon();
     }
 
-    @Override
-    public Content getRootContent() {
-        return rootContent;
-    }
-
     @Override
     public void setRootContent(Content rootContent, String basePath) {
         this.rootContent = rootContent;

diff --git a/src/main/java/com/zestedesavoir/zestwriter/model/MetaContent.java b/src/main/java/com/zestedesavoir/zestwriter/model/MetaContent.java
@@ -29,10 +29,6 @@ public MetaContent(String object, String slug, String title) {
         this._title = title;
     }
 
-    public Content getRootContent() {
-        return rootContent;
-    }
-
     public void setRootContent(Content rootContent, String basePath) {
         setBasePath(basePath);
         this.rootContent = rootContent;

diff --git a/src/main/java/com/zestedesavoir/zestwriter/model/MetadataContent.java b/src/main/java/com/zestedesavoir/zestwriter/model/MetadataContent.java
@@ -1,6 +1,8 @@
 package com.zestedesavoir.zestwriter.model;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Objects;
 

diff --git a/src/main/java/com/zestedesavoir/zestwriter/model/Textual.java b/src/main/java/com/zestedesavoir/zestwriter/model/Textual.java
@@ -14,6 +14,9 @@
 public interface Textual{
 
     String getMarkdown();
+
+    void setMarkdown(String markdown);
+
     default void save() {
         try (FileOutputStream fos = new FileOutputStream(getFilePath())) {
             BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(fos, "UTF8"));
@@ -23,6 +26,7 @@ default void save() {
             MainApp.getLogger().error(e.getMessage(), e);
         }
     }
+
     default String readMarkdown() {
         Path path = Paths.get(this.getFilePath());
         StringBuilder bfString = new StringBuilder();
@@ -37,10 +41,13 @@ default String readMarkdown() {
         }
         return "";
     }
+
     default void loadMarkdown() {
         setMarkdown(readMarkdown());
     }
+
     String getTitle();
+
     default String getLimitedTitle() {
         String title = getTitle();
         if (title.length() > Constant.LIMIT_COUNT_CHARS_OF_TITLE) {
@@ -49,9 +56,8 @@ default String getLimitedTitle() {
             return title;
         }
     }
-    void setMarkdown(String markdown);
+
     String getFilePath();
     void setBasePath(String basePath);
-    Content getRootContent();
     void setRootContent(Content rootContent, String basePath);
 }
diff --git a/src/main/java/com/zestedesavoir/zestwriter/model/TypeContent.java b/src/main/java/com/zestedesavoir/zestwriter/model/TypeContent.java
@@ -1,7 +1,9 @@
 package com.zestedesavoir.zestwriter.model;
 
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Objects;
 

diff --git a/src/main/java/com/zestedesavoir/zestwriter/utils/Lang.java b/src/main/java/com/zestedesavoir/zestwriter/utils/Lang.java
@@ -1,6 +1,9 @@
 package com.zestedesavoir.zestwriter.utils;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,8 +15,8 @@
 @ToString
 @AllArgsConstructor
 public class Lang {
-    private Locale locale;
     private static List<Lang> langAvailable = Arrays.asList(new Lang(Locale.FRANCE), new Lang(Locale.ENGLISH));
+    private Locale locale;
 
     public static Lang getLangFromCode(String code) {
         Optional <Lang> lang = langAvailable.stream().filter(p -> p.locale.toString().equals(code)).findFirst();

diff --git a/src/main/java/com/zestedesavoir/zestwriter/utils/Theme.java b/src/main/java/com/zestedesavoir/zestwriter/utils/Theme.java
@@ -1,6 +1,9 @@
 package com.zestedesavoir.zestwriter.utils;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
 
 import java.util.Arrays;
 import java.util.Calendar;
@@ -12,20 +15,19 @@
 @Setter
 @ToString
 public class Theme {
-    private String filename;
-    private String label;
-    private int startDay=0;
-    private int startMonth=0;
-    private int endDay=0;
-    private int endMonth=0;
-
     private static List<Theme> themeAvailable = Arrays.asList(
             new Theme("dark.css", Configuration.getBundle().getString("ui.options.display.theme.dark")),
             new Theme("light.css", Configuration.getBundle().getString("ui.options.display.theme.light")),
             new Theme("halloween.css", Configuration.getBundle().getString("ui.options.display.theme.halloween"), 31, 10, 2, 11),
             new Theme("winxaito_light.css", "WinXaito's Light"),
             new Theme("winxaito_dark.css", "WinXaito's Dark"),
             new Theme("christmas.css", Configuration.getBundle().getString("ui.options.display.theme.christmas"), 15, 12, 27, 12));
+    private String filename;
+    private String label;
+    private int startDay = 0;
+    private int startMonth = 0;
+    private int endDay = 0;
+    private int endMonth = 0;
 
     public Theme(String filename, String label) {
         this.filename = filename;

diff --git a/src/main/java/com/zestedesavoir/zestwriter/view/MdConvertController.java b/src/main/java/com/zestedesavoir/zestwriter/view/MdConvertController.java
@@ -35,25 +35,24 @@
 import java.util.regex.Pattern;
 
 public class MdConvertController {
-    private MdTextController mdBox;
+    public static final Pattern recognizeNumber = Pattern.compile("^(\\s*)([\\d][\\.]) (\\s*)(.*)");
+    public static final Pattern recognizeBullet = Pattern.compile("^(\\s*)([*|-]) (\\s*)(.*)");
     public static Corrector corrector;
-    private Service<String> renderTask;
     private final Logger logger = LoggerFactory.getLogger(MdConvertController.class);
+    private MdTextController mdBox;
+    private Service<String> renderTask;
     private int xRenderPosition = 0;
     private int yRenderPosition = 0;
     private StringProperty countChars = new SimpleStringProperty();
     private StringProperty countWords = new SimpleStringProperty();
     private StringProperty countTimes = new SimpleStringProperty();
     private BooleanPropertyBase needRefresh = new SimpleBooleanProperty(false);
     private BooleanPropertyBase saved  = new SimpleBooleanProperty(true);
-
     @FXML private WebView renderView;
     @FXML private SplitPane splitPane;
     @FXML private BorderPane boxRender;
     @FXML private Tab tab;
     @FXML private CustomStyledClassedTextArea sourceText;
-    public static final Pattern recognizeNumber = Pattern.compile("^(\\s*)([\\d][\\.]) (\\s*)(.*)");
-    public static final Pattern recognizeBullet = Pattern.compile("^(\\s*)([*|-]) (\\s*)(.*)");
 
     public void setMdBox(MdTextController mdBox, Textual extract) {
         this.mdBox = mdBox;
@@ -181,9 +180,9 @@ public void performStats() {
 
     public void initStats() {
         String fontSize="-fx-font-size: 0.9em;";
-        getMdBox().getMainApp().getMenuController().gethBottomBox().getChildren().clear();
-        getMdBox().getMainApp().getMenuController().gethBottomBox().getColumnConstraints().clear();
-        getMdBox().getMainApp().getMenuController().gethBottomBox().setPadding(new Insets(5, 5, 5, 5));
+        getMdBox().getMainApp().getMenuController().getHBottomBox().getChildren().clear();
+        getMdBox().getMainApp().getMenuController().getHBottomBox().getColumnConstraints().clear();
+        getMdBox().getMainApp().getMenuController().getHBottomBox().setPadding(new Insets(5, 5, 5, 5));
         ColumnConstraints c1 = new ColumnConstraints();
         ColumnConstraints c2 = new ColumnConstraints();
         ColumnConstraints c3 = new ColumnConstraints();
@@ -198,10 +197,10 @@ public void initStats() {
         chars.setStyle(fontSize);
         words.setStyle(fontSize);
         times.setStyle(fontSize);
-        getMdBox().getMainApp().getMenuController().gethBottomBox().getColumnConstraints().addAll(c1, c2, c3, c4);
-        getMdBox().getMainApp().getMenuController().gethBottomBox().add(times, 1, 0);
-        getMdBox().getMainApp().getMenuController().gethBottomBox().add(chars, 2, 0);
-        getMdBox().getMainApp().getMenuController().gethBottomBox().add(words, 3, 0);
+        getMdBox().getMainApp().getMenuController().getHBottomBox().getColumnConstraints().addAll(c1, c2, c3, c4);
+        getMdBox().getMainApp().getMenuController().getHBottomBox().add(times, 1, 0);
+        getMdBox().getMainApp().getMenuController().getHBottomBox().add(chars, 2, 0);
+        getMdBox().getMainApp().getMenuController().getHBottomBox().add(words, 3, 0);
 
         chars.textProperty().bind(countChars);
         words.textProperty().bind(countWords);