Skip to content

Commit

Permalink
Refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
sotasan committed Aug 16, 2023
1 parent ce59207 commit b9f5441
Show file tree
Hide file tree
Showing 35 changed files with 95 additions and 91 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
id("java")
}

group = "com.hohltier"
group = "com.sotasan"
version = "0.8.6"

repositories {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.hohltier.decompiler;
package com.sotasan.decompiler;

import com.formdev.flatlaf.FlatDarkLaf;
import com.formdev.flatlaf.FlatLaf;
import com.formdev.flatlaf.extras.FlatInspector;
import com.hohltier.decompiler.controllers.WindowController;
import com.hohltier.decompiler.services.LoaderService;
import com.sotasan.decompiler.controllers.WindowController;
import com.sotasan.decompiler.services.LoaderService;
import io.github.classgraph.ClassGraph;
import io.github.classgraph.Resource;
import lombok.SneakyThrows;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.hohltier.decompiler.controllers;
package com.sotasan.decompiler.controllers;

import com.hohltier.decompiler.views.AboutView;
import com.sotasan.decompiler.views.AboutView;

public class AboutController extends BaseController<AboutView> {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hohltier.decompiler.controllers;
package com.sotasan.decompiler.controllers;

import lombok.AccessLevel;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.hohltier.decompiler.controllers;
package com.sotasan.decompiler.controllers;

import com.hohltier.decompiler.views.StartView;
import com.sotasan.decompiler.views.StartView;

public class StartController extends BaseController<StartView> {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.hohltier.decompiler.controllers;
package com.sotasan.decompiler.controllers;

import com.hohltier.decompiler.models.FileModel;
import com.hohltier.decompiler.views.TabView;
import com.sotasan.decompiler.models.FileModel;
import com.sotasan.decompiler.views.TabView;
import lombok.Getter;

@Getter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.hohltier.decompiler.controllers;
package com.sotasan.decompiler.controllers;

import com.hohltier.decompiler.models.FileModel;
import com.hohltier.decompiler.transformers.Transformer;
import com.hohltier.decompiler.views.TabsView;
import com.hohltier.decompiler.views.TabView;
import com.sotasan.decompiler.models.FileModel;
import com.sotasan.decompiler.transformers.Transformer;
import com.sotasan.decompiler.views.TabsView;
import com.sotasan.decompiler.views.TabView;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.hohltier.decompiler.controllers;
package com.sotasan.decompiler.controllers;

import com.hohltier.decompiler.models.ArchiveModel;
import com.hohltier.decompiler.models.BaseModel;
import com.hohltier.decompiler.models.FileModel;
import com.hohltier.decompiler.models.PackageModel;
import com.hohltier.decompiler.views.TreeView;
import com.sotasan.decompiler.models.ArchiveModel;
import com.sotasan.decompiler.models.BaseModel;
import com.sotasan.decompiler.models.FileModel;
import com.sotasan.decompiler.models.PackageModel;
import com.sotasan.decompiler.views.TreeView;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;
import javax.swing.tree.DefaultMutableTreeNode;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.hohltier.decompiler.controllers;
package com.sotasan.decompiler.controllers;

import com.hohltier.decompiler.views.WindowView;
import com.sotasan.decompiler.views.WindowView;
import lombok.Getter;

public class WindowController extends BaseController<WindowView> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.hohltier.decompiler.menus;
package com.sotasan.decompiler.menus;

import com.formdev.flatlaf.extras.components.FlatMenuBar;
import com.hohltier.decompiler.menus.help.Help;
import com.hohltier.decompiler.menus.file.File;
import com.sotasan.decompiler.menus.help.Help;
import com.sotasan.decompiler.menus.file.File;

public class MenuBar extends FlatMenuBar {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.hohltier.decompiler.menus.file;
package com.sotasan.decompiler.menus.file;

import com.formdev.flatlaf.extras.components.FlatMenu;
import com.hohltier.decompiler.services.LanguageService;
import com.sotasan.decompiler.services.LanguageService;

import javax.swing.*;
import java.awt.event.KeyEvent;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package com.hohltier.decompiler.menus.file;
package com.sotasan.decompiler.menus.file;

import com.formdev.flatlaf.extras.components.FlatMenuItem;
import com.hohltier.decompiler.controllers.WindowController;
import com.hohltier.decompiler.services.LanguageService;
import com.sotasan.decompiler.controllers.WindowController;
import com.sotasan.decompiler.services.LanguageService;

import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package com.hohltier.decompiler.menus.file;
package com.sotasan.decompiler.menus.file;

import com.formdev.flatlaf.extras.components.FlatMenuItem;
import com.hohltier.decompiler.services.ProcessService;
import com.hohltier.decompiler.services.LanguageService;
import com.sotasan.decompiler.services.ProcessService;
import com.sotasan.decompiler.services.LanguageService;

import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package com.hohltier.decompiler.menus.file;
package com.sotasan.decompiler.menus.file;

import com.formdev.flatlaf.extras.components.FlatMenuItem;
import com.hohltier.decompiler.controllers.WindowController;
import com.hohltier.decompiler.services.LoaderService;
import com.hohltier.decompiler.services.LanguageService;
import com.sotasan.decompiler.controllers.WindowController;
import com.sotasan.decompiler.services.LoaderService;
import com.sotasan.decompiler.services.LanguageService;

import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
import java.awt.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.hohltier.decompiler.menus.help;
package com.sotasan.decompiler.menus.help;

import com.formdev.flatlaf.extras.components.FlatMenu;
import com.hohltier.decompiler.services.LanguageService;
import com.sotasan.decompiler.services.LanguageService;
import java.awt.*;
import java.awt.event.KeyEvent;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.hohltier.decompiler.menus.help;
package com.sotasan.decompiler.menus.help;

import com.formdev.flatlaf.extras.components.FlatMenuItem;
import com.hohltier.decompiler.controllers.AboutController;
import com.hohltier.decompiler.services.LanguageService;
import com.sotasan.decompiler.controllers.AboutController;
import com.sotasan.decompiler.services.LanguageService;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hohltier.decompiler.models;
package com.sotasan.decompiler.models;

public class ArchiveModel extends BaseModel {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hohltier.decompiler.models;
package com.sotasan.decompiler.models;

import lombok.Getter;
import lombok.SneakyThrows;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hohltier.decompiler.models;
package com.sotasan.decompiler.models;

import lombok.Getter;
import lombok.SneakyThrows;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hohltier.decompiler.models;
package com.sotasan.decompiler.models;

public class PackageModel extends BaseModel {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hohltier.decompiler.services;
package com.sotasan.decompiler.services;

import lombok.experimental.UtilityClass;
import org.jetbrains.annotations.NotNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.hohltier.decompiler.services;

import com.hohltier.decompiler.controllers.TreeController;
import com.hohltier.decompiler.controllers.TabsController;
import com.hohltier.decompiler.controllers.WindowController;
import com.hohltier.decompiler.models.ArchiveModel;
import com.hohltier.decompiler.models.BaseModel;
import com.hohltier.decompiler.models.FileModel;
import com.hohltier.decompiler.models.PackageModel;
package com.sotasan.decompiler.services;

import com.sotasan.decompiler.controllers.TreeController;
import com.sotasan.decompiler.controllers.TabsController;
import com.sotasan.decompiler.controllers.WindowController;
import com.sotasan.decompiler.models.ArchiveModel;
import com.sotasan.decompiler.models.BaseModel;
import com.sotasan.decompiler.models.FileModel;
import com.sotasan.decompiler.models.PackageModel;
import lombok.SneakyThrows;
import lombok.experimental.UtilityClass;
import org.jetbrains.annotations.NotNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.hohltier.decompiler.services;
package com.sotasan.decompiler.services;

import com.hohltier.decompiler.Main;
import com.sotasan.decompiler.Main;
import lombok.SneakyThrows;
import lombok.experimental.UtilityClass;
import java.lang.management.ManagementFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.hohltier.decompiler.transformers;
package com.sotasan.decompiler.transformers;

import com.hohltier.decompiler.models.FileModel;
import com.sotasan.decompiler.models.FileModel;
import org.benf.cfr.reader.api.CfrDriver;
import org.benf.cfr.reader.api.ClassFileSource;
import org.benf.cfr.reader.api.OutputSinkFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.hohltier.decompiler.transformers;
package com.sotasan.decompiler.transformers;

import com.hohltier.decompiler.models.FileModel;
import com.sotasan.decompiler.models.FileModel;
import org.jetbrains.java.decompiler.main.Fernflower;
import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider;
import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.hohltier.decompiler.transformers;
package com.sotasan.decompiler.transformers;

import com.hohltier.decompiler.models.FileModel;
import com.sotasan.decompiler.models.FileModel;

public interface ITransformer {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.hohltier.decompiler.transformers;
package com.sotasan.decompiler.transformers;

import com.hohltier.decompiler.models.FileModel;
import com.sotasan.decompiler.models.FileModel;
import com.strobel.assembler.metadata.ArrayTypeLoader;
import com.strobel.decompiler.Decompiler;
import com.strobel.decompiler.DecompilerSettings;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hohltier.decompiler.transformers;
package com.sotasan.decompiler.transformers;

import lombok.Getter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.hohltier.decompiler.views;
package com.sotasan.decompiler.views;

import com.formdev.flatlaf.FlatClientProperties;
import com.formdev.flatlaf.extras.components.FlatButton;
import com.formdev.flatlaf.extras.components.FlatLabel;
import com.hohltier.decompiler.controllers.WindowController;
import com.hohltier.decompiler.services.LanguageService;
import com.sotasan.decompiler.controllers.WindowController;
import com.sotasan.decompiler.services.LanguageService;
import lombok.Getter;
import lombok.SneakyThrows;
import net.miginfocom.swing.MigLayout;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.hohltier.decompiler.views;
package com.sotasan.decompiler.views;

import com.formdev.flatlaf.extras.components.FlatLabel;
import com.hohltier.decompiler.services.LanguageService;
import com.sotasan.decompiler.services.LanguageService;
import lombok.Getter;
import net.miginfocom.swing.MigLayout;
import javax.swing.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.hohltier.decompiler.views;
package com.sotasan.decompiler.views;

import com.hohltier.decompiler.controllers.TabController;
import com.sotasan.decompiler.controllers.TabController;
import lombok.Getter;
import lombok.Setter;
import lombok.SneakyThrows;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.hohltier.decompiler.views;
package com.sotasan.decompiler.views;

import com.formdev.flatlaf.extras.components.FlatComboBox;
import com.formdev.flatlaf.extras.components.FlatTabbedPane;
import com.formdev.flatlaf.extras.components.FlatToolBar;
import com.hohltier.decompiler.transformers.Transformer;
import com.sotasan.decompiler.transformers.Transformer;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.hohltier.decompiler.views;
package com.sotasan.decompiler.views;

import com.formdev.flatlaf.extras.components.FlatScrollPane;
import com.formdev.flatlaf.extras.components.FlatTree;
import com.hohltier.decompiler.controllers.TabsController;
import com.hohltier.decompiler.models.BaseModel;
import com.hohltier.decompiler.models.FileModel;
import com.sotasan.decompiler.controllers.TabsController;
import com.sotasan.decompiler.models.BaseModel;
import com.sotasan.decompiler.models.FileModel;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.hohltier.decompiler.views;
package com.sotasan.decompiler.views;

import com.formdev.flatlaf.extras.components.FlatSplitPane;
import com.hohltier.decompiler.controllers.StartController;
import com.hohltier.decompiler.controllers.TreeController;
import com.hohltier.decompiler.controllers.TabsController;
import com.hohltier.decompiler.services.LoaderService;
import com.hohltier.decompiler.services.LanguageService;
import com.hohltier.decompiler.menus.MenuBar;
import com.sotasan.decompiler.controllers.StartController;
import com.sotasan.decompiler.controllers.TreeController;
import com.sotasan.decompiler.controllers.TabsController;
import com.sotasan.decompiler.services.LoaderService;
import com.sotasan.decompiler.services.LanguageService;
import com.sotasan.decompiler.menus.MenuBar;
import lombok.Getter;
import lombok.SneakyThrows;
import org.jetbrains.annotations.NotNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hohltier.decompiler;
package com.sotasan.decompiler;

public class Main {

Expand Down

0 comments on commit b9f5441

Please sign in to comment.