Skip to content

Commit 9a6a7e7

Browse files
omegauiomegaui
committed
Renamed AppDataManager!
1 parent 3355e59 commit 9a6a7e7

28 files changed

+616
-205
lines changed

‎.idea/libraries/json.xml

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/uiDesigner.xml

+124
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/json.jar

68.7 KB
Binary file not shown.

‎omegaide.iml

+1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
<orderEntry type="sourceFolder" forTests="false" />
1111
<orderEntry type="library" name="out" level="project" />
1212
<orderEntry type="library" name="lib" level="project" />
13+
<orderEntry type="library" name="json" level="project" />
1314
</component>
1415
</module>

‎src/omega/Screen.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public class Screen extends UBRFrame {
8686

8787
private static Robot robot;
8888
private static UIManager uiManager;
89-
private static DataManager dataManager;
89+
private static AppDataManager dataManager;
9090
private static ProjectFile projectFile;
9191
private static ProjectRunner projectRunner;
9292
private static ProjectBuilder projectBuilder;
@@ -108,7 +108,7 @@ public Screen() {
108108
Startup.writeUIFiles();
109109
if(!File.separator.equals("/"))
110110
PATH_SEPARATOR = ";";
111-
dataManager = new DataManager(this);
111+
dataManager = new AppDataManager(this);
112112
Color x;
113113
Color y;
114114
if(UIManager.isDarkMode()) {
@@ -403,9 +403,9 @@ private void init() {
403403

404404
splash.setProgress(100, "");
405405

406-
File file = new File(DataManager.getDefaultProjectPath());
406+
File file = new File(AppDataManager.getDefaultProjectPath());
407407

408-
if(DataManager.getWorkspace().equals("") || !new File(DataManager.getWorkspace()).exists())
408+
if(AppDataManager.getWorkspace().equals("") || !new File(AppDataManager.getWorkspace()).exists())
409409
new WorkspaceSelector(this).setVisible(true);
410410

411411
if(file.exists() && file.isDirectory()) {
@@ -818,7 +818,7 @@ public static UIManager getUIManager() {
818818
return uiManager;
819819
}
820820

821-
public static DataManager getDataManager(){
821+
public static AppDataManager getDataManager(){
822822
return dataManager;
823823
}
824824

@@ -829,7 +829,7 @@ public void saveAllBookmarks() {
829829
}
830830

831831
public void saveAllEditors() {
832-
if(DataManager.isSourceDefenderEnabled())
832+
if(AppDataManager.isSourceDefenderEnabled())
833833
ToolMenu.sourceDefender.backupData();
834834
tabPanel.getEditors().forEach(Editor::saveCurrentFile);
835835
rightTabPanel.getEditors().forEach(Editor::saveCurrentFile);

‎src/omega/instant/support/build/gradle/GradleBuildScriptManager.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package omega.instant.support.build.gradle;
2020
import omega.Screen;
2121

22-
import omega.io.DataManager;
22+
import omega.io.AppDataManager;
2323

2424
import omegaui.component.TextComp;
2525
import omegaui.component.NoCaretField;
@@ -87,14 +87,14 @@ public void apply(){
8787
}
8888
titleComp.setColors(TOOLMENU_COLOR3, c2, c2);
8989
titleComp.setText("Specify Gradle Build Script Name");
90-
DataManager.setGradleCommand(text);
90+
AppDataManager.setGradleCommand(text);
9191
setVisible(false);
9292
}
9393

9494
@Override
9595
public void setVisible(boolean value){
9696
if(value){
97-
nameField.setText(DataManager.getGradleCommand());
97+
nameField.setText(AppDataManager.getGradleCommand());
9898
}
9999
super.setVisible(value);
100100
}

‎src/omega/instant/support/build/gradle/GradleProcessManager.java

+6-8
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717
*/
1818

1919
package omega.instant.support.build.gradle;
20-
import omega.io.DataManager;
20+
import omega.io.AppDataManager;
2121
import omega.io.IconManager;
2222

2323
import omega.ui.panel.JetRunPanel;
2424

25-
import java.util.Scanner;
26-
2725
import omega.Screen;
2826

2927
import java.io.File;
@@ -72,10 +70,10 @@ public static void run(){
7270
}
7371

7472

75-
JetRunPanel printArea = new JetRunPanel(false, new String[]{DataManager.getGradleCommand() + ext, "run"}, Screen.getProjectFile().getProjectPath());
76-
printArea.launchAsTerminal(GradleProcessManager::run, IconManager.fluentgradleImage, DataManager.getGradleCommand() + " run");
73+
JetRunPanel printArea = new JetRunPanel(false, new String[]{AppDataManager.getGradleCommand() + ext, "run"}, Screen.getProjectFile().getProjectPath());
74+
printArea.launchAsTerminal(GradleProcessManager::run, IconManager.fluentgradleImage, AppDataManager.getGradleCommand() + " run");
7775

78-
printArea.print("# Executing : " + DataManager.getGradleCommand() +" run");
76+
printArea.print("# Executing : " + AppDataManager.getGradleCommand() +" run");
7977
printArea.print("--------------------------------------------------");
8078

8179
printArea.start();
@@ -104,9 +102,9 @@ public static void build(){
104102
Screen.getProjectFile().getProjectManager().save();
105103
}
106104

107-
JetRunPanel printArea = new JetRunPanel(false, new String[]{DataManager.getGradleCommand() + ext, "build"}, Screen.getProjectFile().getProjectPath());
105+
JetRunPanel printArea = new JetRunPanel(false, new String[]{AppDataManager.getGradleCommand() + ext, "build"}, Screen.getProjectFile().getProjectPath());
108106
printArea.setLogMode(true);
109-
printArea.print("# Executing : " + DataManager.getGradleCommand() +" build");
107+
printArea.print("# Executing : " + AppDataManager.getGradleCommand() +" build");
110108
printArea.print("--------------------------------------------------");
111109

112110
printArea.start();

‎src/omega/instant/support/java/JavaProjectWizard.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import java.io.File;
3030

3131
import omega.io.IconManager;
32-
import omega.io.DataManager;
32+
import omega.io.AppDataManager;
3333
import omega.io.ProjectDataBase;
3434

3535
import omegaui.component.TextComp;
@@ -226,8 +226,8 @@ public void selectJDKRoot(){
226226
LinkedList c;
227227
LinkedList<File> selections = fileSelectionDialog.selectDirectories();
228228
if(!selections.isEmpty()){
229-
DataManager.setPathToJava(selections.get(0).getAbsolutePath());
230-
jdkRootComp.setText(DataManager.getPathToJava());
229+
AppDataManager.setPathToJava(selections.get(0).getAbsolutePath());
230+
jdkRootComp.setText(AppDataManager.getPathToJava());
231231
}
232232
}
233233

@@ -312,7 +312,7 @@ else if(osName.contains("indows")){
312312
}
313313

314314
if(path != null){
315-
DataManager.setPathToJava(path);
315+
AppDataManager.setPathToJava(path);
316316
jdkRootComp.setText(path);
317317
setStatus("Saved " + path + " as JDK Root", false, path);
318318
}
@@ -332,7 +332,7 @@ public boolean containsJDKs(File jdkDir){
332332
public void load(){
333333
setStatus("", true, "");
334334

335-
String workspace = DataManager.getWorkspace();
335+
String workspace = AppDataManager.getWorkspace();
336336
File file = new File(workspace);
337337
if(workspace != null && file.exists()){
338338
workspaceComp.setText(file.getName());
@@ -341,7 +341,7 @@ public void load(){
341341
else
342342
workspaceComp.setText("Specify Workspace");
343343

344-
String jdkRoot = DataManager.getPathToJava();
344+
String jdkRoot = AppDataManager.getPathToJava();
345345
file = new File(jdkRoot);
346346

347347
if(jdkRoot != null && file.exists())

‎src/omega/instant/support/java/assist/ContentTokenizer.java

+2-10
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
*/
1818

1919
package omega.instant.support.java.assist;
20-
import java.io.File;
21-
22-
import omega.instant.support.java.highlighter.BasicCodeHighlighter;
2320

2421
import omega.instant.support.AbstractContentTokenizer;
2522
import omega.instant.support.CodeFrameworks;
@@ -35,16 +32,11 @@
3532
import omega.instant.support.java.framework.ImportFramework;
3633

3734
import omega.io.SnippetBase;
38-
import omega.io.DataManager;
39-
import omega.io.FileOperationManager;
35+
import omega.io.AppDataManager;
4036

4137
import java.util.LinkedList;
4238
import java.util.StringTokenizer;
4339

44-
import org.fife.ui.rsyntaxtextarea.Token;
45-
import org.fife.ui.rsyntaxtextarea.TokenTypes;
46-
47-
import static omega.io.UIManager.*;
4840
public class ContentTokenizer extends AbstractContentTokenizer{
4941

5042
public static boolean isConditionalCode(String code){
@@ -143,7 +135,7 @@ public String getRepresentableValue(){
143135

144136
@Override
145137
public void arrangeTokens(Editor e) {
146-
if(!e.currentFile.getName().endsWith(".java") || Screen.getProjectFile().getProjectManager().isLanguageTagNonJava() || !DataManager.isContentModeJava()){
138+
if(!e.currentFile.getName().endsWith(".java") || Screen.getProjectFile().getProjectManager().isLanguageTagNonJava() || !AppDataManager.isContentModeJava()){
147139
arrangeTokens(e, CodeFramework.getCodeIgnoreDot(e.getText(), e.getCaretPosition()));
148140
return;
149141
}

0 commit comments

Comments
 (0)