Browse Source

refactor

tags/v1.1.0
Robin Thoni 7 years ago
parent
commit
01dda15ad0

+ 4
- 4
src/com/rthoni/intellij/codefromds/dbo/ColumnSelection.java View File

@@ -10,6 +10,10 @@ import java.util.HashMap;
10 10
  */
11 11
 public class ColumnSelection {
12 12
 
13
+    private DasColumn _column;
14
+
15
+    private boolean _selected;
16
+
13 17
     public ColumnSelection() {
14 18
 
15 19
     }
@@ -19,10 +23,6 @@ public class ColumnSelection {
19 23
         _selected = true;
20 24
     }
21 25
 
22
-    private DasColumn _column;
23
-
24
-    private boolean _selected;
25
-
26 26
     public HashMap<String, Object> toMap()
27 27
     {
28 28
         HashMap<String, Object> map = new HashMap<>();

+ 4
- 4
src/com/rthoni/intellij/codefromds/dbo/DataSourceSelection.java View File

@@ -17,6 +17,10 @@ import java.util.stream.Collectors;
17 17
  */
18 18
 public class DataSourceSelection {
19 19
 
20
+    private DbDataSource _source;
21
+
22
+    private List<TableSelection> _tables;
23
+
20 24
     public DataSourceSelection(DbDataSource source) {
21 25
         _source = source;
22 26
         final List<? extends DasTable> tables = DasUtil.getTables(source).toList();
@@ -29,10 +33,6 @@ public class DataSourceSelection {
29 33
         }
30 34
     }
31 35
 
32
-    private DbDataSource _source;
33
-
34
-    private List<TableSelection> _tables;
35
-
36 36
     public HashMap<String, Object> toMap()
37 37
     {
38 38
         HashMap<String, Object> map = new HashMap<>();

+ 12
- 12
src/com/rthoni/intellij/codefromds/dbo/GenerateOptions.java View File

@@ -20,6 +20,18 @@ import java.util.stream.Collectors;
20 20
  */
21 21
 public class GenerateOptions {
22 22
 
23
+    private DataSourceSelection _selection;
24
+
25
+    private String _modelsRelativePath;
26
+
27
+    private String _dataSourceTemplateRelativePath;
28
+
29
+    private String _modelsTemplateRelativePath;
30
+
31
+    private String _configAbsolutePath;
32
+
33
+    private String _filesExtension;
34
+
23 35
     public GenerateOptions(DbDataSource source) {
24 36
         _modelsRelativePath = "Models";
25 37
         _dataSourceTemplateRelativePath = "Templates" + File.separator + "DataSource.twig";
@@ -44,18 +56,6 @@ public class GenerateOptions {
44 56
         _selection.setTables(tableSelections);
45 57
     }
46 58
 
47
-    private DataSourceSelection _selection;
48
-
49
-    private String _modelsRelativePath;
50
-
51
-    private String _dataSourceTemplateRelativePath;
52
-
53
-    private String _modelsTemplateRelativePath;
54
-
55
-    private String _configAbsolutePath;
56
-
57
-    private String _filesExtension;
58
-
59 59
     public HashMap<String, Object> toMap()
60 60
     {
61 61
         HashMap<String, Object> map = new HashMap<>();

Loading…
Cancel
Save