mirror of
https://github.com/OMGeeky/ATCS.git
synced 2026-01-23 11:45:27 +01:00
remove Unnecessary semicolons
This commit is contained in:
@@ -113,7 +113,6 @@ public class ATContentStudio {
|
|||||||
frame.setDefaultCloseOperation(StudioFrame.DO_NOTHING_ON_CLOSE);
|
frame.setDefaultCloseOperation(StudioFrame.DO_NOTHING_ON_CLOSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
});
|
});
|
||||||
for (File f : ConfigCache.getKnownWorkspaces()) {
|
for (File f : ConfigCache.getKnownWorkspaces()) {
|
||||||
if (workspaceRoot.equals(f)) {
|
if (workspaceRoot.equals(f)) {
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ public class ActorCondition extends JSONElement {
|
|||||||
|
|
||||||
public static final Integer MAGNITUDE_CLEAR = -99;
|
public static final Integer MAGNITUDE_CLEAR = -99;
|
||||||
public static final Integer DURATION_FOREVER = 999;
|
public static final Integer DURATION_FOREVER = 999;
|
||||||
;
|
|
||||||
public static final Integer DURATION_NONE = 0;
|
public static final Integer DURATION_NONE = 0;
|
||||||
|
|
||||||
// Available from init state
|
// Available from init state
|
||||||
|
|||||||
@@ -614,7 +614,6 @@ public class Item extends JSONElement {
|
|||||||
price += kill_effect == null ? 0 : calculateUseCost();
|
price += kill_effect == null ? 0 : calculateUseCost();
|
||||||
} else if (category.action_type == ItemCategory.ActionType.equip) {
|
} else if (category.action_type == ItemCategory.ActionType.equip) {
|
||||||
price += equip_effect == null ? 0 : calculateEquipCost(isWeapon());
|
price += equip_effect == null ? 0 : calculateEquipCost(isWeapon());
|
||||||
;
|
|
||||||
price += hit_effect == null ? 0 : calculateHitCost();
|
price += hit_effect == null ? 0 : calculateHitCost();
|
||||||
price += kill_effect == null ? 0 : calculateKillCost();
|
price += kill_effect == null ? 0 : calculateKillCost();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -574,7 +574,5 @@ public class NPC extends JSONElement {
|
|||||||
return new Double(Math.ceil(experience)).intValue();
|
return new Double(Math.ceil(experience)).intValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -119,7 +119,6 @@ public class TMXMapSet implements ProjectTreeNode {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
watcher.start();
|
watcher.start();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,8 +37,6 @@ public class Spritesheet extends GameDataElement {
|
|||||||
actorcondition
|
actorcondition
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
//Lazy initialization.
|
//Lazy initialization.
|
||||||
public BufferedImage spritesheet = null;
|
public BufferedImage spritesheet = null;
|
||||||
public Map<Integer, BufferedImage> cache_full_size = new LinkedHashMap<Integer, BufferedImage>();
|
public Map<Integer, BufferedImage> cache_full_size = new LinkedHashMap<Integer, BufferedImage>();
|
||||||
|
|||||||
@@ -126,7 +126,6 @@ public abstract class Editor extends JPanel implements ProjectElementListener {
|
|||||||
translationStatus.setText(unit.translatedText);
|
translationStatus.setText(unit.translatedText);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
}.start();
|
}.start();
|
||||||
pane.add(labelPane, JideBoxLayout.FIX);
|
pane.add(labelPane, JideBoxLayout.FIX);
|
||||||
tfComponent.getDocument().addDocumentListener(new DocumentListener() {
|
tfComponent.getDocument().addDocumentListener(new DocumentListener() {
|
||||||
@@ -333,18 +332,15 @@ public abstract class Editor extends JPanel implements ProjectElementListener {
|
|||||||
defaultChance = Integer.parseInt(defaultValue.substring(0, c));
|
defaultChance = Integer.parseInt(defaultValue.substring(0, c));
|
||||||
} catch (NumberFormatException nfe) {
|
} catch (NumberFormatException nfe) {
|
||||||
}
|
}
|
||||||
;
|
|
||||||
try {
|
try {
|
||||||
defaultMaxChance = Integer.parseInt(defaultValue.substring(c + 1));
|
defaultMaxChance = Integer.parseInt(defaultValue.substring(c + 1));
|
||||||
} catch (NumberFormatException nfe) {
|
} catch (NumberFormatException nfe) {
|
||||||
}
|
}
|
||||||
;
|
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
defaultChance = Integer.parseInt(defaultValue);
|
defaultChance = Integer.parseInt(defaultValue);
|
||||||
} catch (NumberFormatException nfe) {
|
} catch (NumberFormatException nfe) {
|
||||||
}
|
}
|
||||||
;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -358,19 +354,16 @@ public abstract class Editor extends JPanel implements ProjectElementListener {
|
|||||||
chance = Integer.parseInt(initialValue.substring(0, c));
|
chance = Integer.parseInt(initialValue.substring(0, c));
|
||||||
} catch (NumberFormatException nfe) {
|
} catch (NumberFormatException nfe) {
|
||||||
}
|
}
|
||||||
;
|
|
||||||
try {
|
try {
|
||||||
maxChance = Integer.parseInt(initialValue.substring(c + 1));
|
maxChance = Integer.parseInt(initialValue.substring(c + 1));
|
||||||
} catch (NumberFormatException nfe) {
|
} catch (NumberFormatException nfe) {
|
||||||
}
|
}
|
||||||
;
|
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
chance = Integer.parseInt(initialValue);
|
chance = Integer.parseInt(initialValue);
|
||||||
currentFormIsRatio = false;
|
currentFormIsRatio = false;
|
||||||
} catch (NumberFormatException nfe) {
|
} catch (NumberFormatException nfe) {
|
||||||
}
|
}
|
||||||
;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,12 +10,12 @@ public class ScrollablePanel extends JPanel implements Scrollable, SwingConstant
|
|||||||
public enum ScrollableSizeHint {
|
public enum ScrollableSizeHint {
|
||||||
NONE,
|
NONE,
|
||||||
FIT,
|
FIT,
|
||||||
STRETCH;
|
STRETCH
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum IncrementType {
|
public enum IncrementType {
|
||||||
PERCENT,
|
PERCENT,
|
||||||
PIXELS;
|
PIXELS
|
||||||
}
|
}
|
||||||
|
|
||||||
private ScrollableSizeHint scrollableHeight = ScrollableSizeHint.NONE;
|
private ScrollableSizeHint scrollableHeight = ScrollableSizeHint.NONE;
|
||||||
|
|||||||
@@ -45,7 +45,6 @@ public class WorkerDialog extends JDialog {
|
|||||||
JOptionPane.showMessageDialog(parent, "<html><font size=" + (int) (5 * ATContentStudio.SCALING) + ">Done !</font></html>");
|
JOptionPane.showMessageDialog(parent, "<html><font size=" + (int) (5 * ATContentStudio.SCALING) + ">Done !</font></html>");
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
}.start();
|
}.start();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ public class WorkspaceActions {
|
|||||||
new ProjectCreationWizard().setVisible(true);
|
new ProjectCreationWizard().setVisible(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -44,13 +43,10 @@ public class WorkspaceActions {
|
|||||||
selectedNode = null;
|
selectedNode = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
||||||
setEnabled(selectedNode instanceof Project);
|
setEnabled(selectedNode instanceof Project);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -60,13 +56,10 @@ public class WorkspaceActions {
|
|||||||
Workspace.openProject((ClosedProject) selectedNode);
|
Workspace.openProject((ClosedProject) selectedNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
||||||
setEnabled(selectedNode instanceof ClosedProject);
|
setEnabled(selectedNode instanceof ClosedProject);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
public ATCSAction deleteProject = new ATCSAction("Delete project", "Deletes the project, and all created/altered data, from disk") {
|
public ATCSAction deleteProject = new ATCSAction("Delete project", "Deletes the project, and all created/altered data, from disk") {
|
||||||
@@ -82,13 +75,10 @@ public class WorkspaceActions {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
||||||
setEnabled(selectedNode instanceof Project || selectedNode instanceof ClosedProject);
|
setEnabled(selectedNode instanceof Project || selectedNode instanceof ClosedProject);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
public ATCSAction saveElement = new ATCSAction("Save this element", "Saves the current state of this element on disk") {
|
public ATCSAction saveElement = new ATCSAction("Save this element", "Saves the current state of this element on disk") {
|
||||||
@@ -101,8 +91,6 @@ public class WorkspaceActions {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
||||||
if (selectedNode instanceof GameDataElement) {
|
if (selectedNode instanceof GameDataElement) {
|
||||||
setEnabled(((GameDataElement) selectedNode).needsSaving());
|
setEnabled(((GameDataElement) selectedNode).needsSaving());
|
||||||
@@ -111,7 +99,6 @@ public class WorkspaceActions {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
public ATCSAction deleteSelected = new ATCSAction("Delete", "Deletes the selected items") {
|
public ATCSAction deleteSelected = new ATCSAction("Delete", "Deletes the selected items") {
|
||||||
@@ -122,8 +109,6 @@ public class WorkspaceActions {
|
|||||||
putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0));
|
putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
if (multiMode) {
|
if (multiMode) {
|
||||||
if (elementsToDelete == null) return;
|
if (elementsToDelete == null) return;
|
||||||
@@ -253,8 +238,6 @@ public class WorkspaceActions {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
||||||
elementsToDelete = null;
|
elementsToDelete = null;
|
||||||
if (selectedPaths != null && selectedPaths.length > 1) {
|
if (selectedPaths != null && selectedPaths.length > 1) {
|
||||||
@@ -284,7 +267,6 @@ public class WorkspaceActions {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
public ATCSAction createGDE = new ATCSAction("Create Game Data Element (JSON)", "Opens the game object creation wizard") {
|
public ATCSAction createGDE = new ATCSAction("Create Game Data Element (JSON)", "Opens the game object creation wizard") {
|
||||||
@@ -341,13 +323,10 @@ public class WorkspaceActions {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
||||||
setEnabled(selectedNode instanceof Project || selectedNode instanceof SavedGamesSet);
|
setEnabled(selectedNode instanceof Project || selectedNode instanceof SavedGamesSet);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
public ATCSAction compareItems = new ATCSAction("Items comparator", "Opens an editor showing all the items of the project in a table") {
|
public ATCSAction compareItems = new ATCSAction("Items comparator", "Opens an editor showing all the items of the project in a table") {
|
||||||
@@ -378,13 +357,10 @@ public class WorkspaceActions {
|
|||||||
new ExportProjectWizard(selectedNode.getProject()).setVisible(true);
|
new ExportProjectWizard(selectedNode.getProject()).setVisible(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
||||||
setEnabled(selectedNode != null && selectedNode.getProject() != null);
|
setEnabled(selectedNode != null && selectedNode.getProject() != null);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
public ATCSAction runBeanShell = new ATCSAction("Run Beanshell console", "Opens a beanshell scripting pad.") {
|
public ATCSAction runBeanShell = new ATCSAction("Run Beanshell console", "Opens a beanshell scripting pad.") {
|
||||||
@@ -392,7 +368,6 @@ public class WorkspaceActions {
|
|||||||
new BeanShellView();
|
new BeanShellView();
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
public ATCSAction showAbout = new ATCSAction("About...", "Displays credits and other informations about ATCS") {
|
public ATCSAction showAbout = new ATCSAction("About...", "Displays credits and other informations about ATCS") {
|
||||||
@@ -400,7 +375,6 @@ public class WorkspaceActions {
|
|||||||
ATContentStudio.frame.showAbout();
|
ATContentStudio.frame.showAbout();
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
public ATCSAction exitATCS = new ATCSAction("Exit", "Closes the program") {
|
public ATCSAction exitATCS = new ATCSAction("Exit", "Closes the program") {
|
||||||
@@ -415,7 +389,6 @@ public class WorkspaceActions {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
public ATCSAction createWriter = new ATCSAction("Create dialogue sketch", "Create a dialogue sketch for fast dialogue edition") {
|
public ATCSAction createWriter = new ATCSAction("Create dialogue sketch", "Create a dialogue sketch for fast dialogue edition") {
|
||||||
@@ -435,8 +408,6 @@ public class WorkspaceActions {
|
|||||||
// frame.setVisible(true);
|
// frame.setVisible(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
||||||
setEnabled(selectedNode != null && selectedNode.getProject() != null);
|
setEnabled(selectedNode != null && selectedNode.getProject() != null);
|
||||||
}
|
}
|
||||||
@@ -464,8 +435,6 @@ public class WorkspaceActions {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
||||||
setEnabled(selectedNode != null && selectedNode instanceof Dialogue);
|
setEnabled(selectedNode != null && selectedNode instanceof Dialogue);
|
||||||
}
|
}
|
||||||
@@ -476,13 +445,10 @@ public class WorkspaceActions {
|
|||||||
new WorkspaceSettingsEditor(Workspace.activeWorkspace.settings);
|
new WorkspaceSettingsEditor(Workspace.activeWorkspace.settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
|
||||||
setEnabled(true);
|
setEnabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
List<ATCSAction> actions = new ArrayList<WorkspaceActions.ATCSAction>();
|
List<ATCSAction> actions = new ArrayList<WorkspaceActions.ATCSAction>();
|
||||||
@@ -541,8 +507,6 @@ public class WorkspaceActions {
|
|||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
public Map<String, Object> values = new LinkedHashMap<String, Object>();
|
public Map<String, Object> values = new LinkedHashMap<String, Object>();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1165,7 +1165,6 @@ public class ItemEditor extends JSONElementEditor {
|
|||||||
public static class SourceTimedConditionsListModel extends OrderedListenerListModel<Common.DeathEffect, Common.TimedConditionEffect> {
|
public static class SourceTimedConditionsListModel extends OrderedListenerListModel<Common.DeathEffect, Common.TimedConditionEffect> {
|
||||||
public SourceTimedConditionsListModel(Common.DeathEffect effect) {
|
public SourceTimedConditionsListModel(Common.DeathEffect effect) {
|
||||||
super(effect);
|
super(effect);
|
||||||
;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -204,7 +204,6 @@ public class DialogueGraphView extends Display {
|
|||||||
dNode.setString(LABEL, message + translationHeader + unit.translatedText);
|
dNode.setString(LABEL, message + translationHeader + unit.translatedText);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
label = dialogue.message;
|
label = dialogue.message;
|
||||||
@@ -244,7 +243,6 @@ public class DialogueGraphView extends Display {
|
|||||||
rNode.setString(LABEL, message + translationHeader + unit.translatedText);
|
rNode.setString(LABEL, message + translationHeader + unit.translatedText);
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
label = r.text;
|
label = r.text;
|
||||||
|
|||||||
@@ -985,7 +985,6 @@ public class WorldMapEditor extends Editor implements FieldUpdateListener {
|
|||||||
repaintMap();
|
repaintMap();
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
private void setCurrentSelectionModel(ListModel<TMXMap> listModel, ListSelectionModel listSelectionModel) {
|
private void setCurrentSelectionModel(ListModel<TMXMap> listModel, ListSelectionModel listSelectionModel) {
|
||||||
|
|||||||
@@ -323,7 +323,6 @@ public class SpritesheetEditor extends Editor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
animator.start();
|
animator.start();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -768,8 +768,6 @@ public class WriterModeEditor extends Editor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
|
|
||||||
private void showEditorOnSelected() {
|
private void showEditorOnSelected() {
|
||||||
if (selected == null) return;
|
if (selected == null) return;
|
||||||
|
|||||||
Reference in New Issue
Block a user