OMGeeky/ATCS
1
0
Fork 0
mirror of https://github.com/OMGeeky/ATCS.git synced 2026-01-20 18:31:09 +01:00
Code Issues Packages Projects Releases 15 Wiki Activity

reformat file & optimize usings

Browse Source
This commit is contained in:
OMGeeky
2023-09-10 16:11:02 +02:00
parent 693de98212
commit fc0d97aa2f
1 changed files with 38 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/gpl/rpg/atcontentstudio/ui/sprites/SpriteChooser.java
View File

@@ -1,24 +1,15 @@
package com.gpl.rpg.atcontentstudio.ui.sprites; package com.gpl.rpg.atcontentstudio.ui.sprites;
import java.awt.BorderLayout; import java.awt.*;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Image;
import java.awt.Point;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;
import java.awt.image.WritableRaster;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.swing.*;
import javax.swing.ButtonGroup;
import javax.swing.ImageIcon;
import javax.swing.JDialog;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JToggleButton;
import javax.swing.ScrollPaneConstants;
import com.gpl.rpg.atcontentstudio.ATContentStudio; import com.gpl.rpg.atcontentstudio.ATContentStudio;
import com.gpl.rpg.atcontentstudio.model.Project; import com.gpl.rpg.atcontentstudio.model.Project;
@@ -34,8 +25,8 @@ public class SpriteChooser extends JDialog {
private static final int STD_HEIGHT = 32; private static final int STD_HEIGHT = 32;
private static final int MAX_PER_ROW = 10; private static final int MAX_PER_ROW = 10;
public static Map<Project, Map<Spritesheet.Category, SpriteChooser>> cache = new LinkedHashMap<Project, Map<Spritesheet.Category,SpriteChooser>>(); public static Map<Project, Map<Spritesheet.Category, SpriteChooser>> cache = new LinkedHashMap<Project, Map<Spritesheet.Category, SpriteChooser>>();
public static Map<Project, Map<Spritesheet.Category, List<Spritesheet>>> cacheValidator = new LinkedHashMap<Project, Map<Category,List<Spritesheet>>>(); public static Map<Project, Map<Spritesheet.Category, List<Spritesheet>>> cacheValidator = new LinkedHashMap<Project, Map<Category, List<Spritesheet>>>();
public static SpriteChooser getChooser(Project proj, Spritesheet.Category category) { public static SpriteChooser getChooser(Project proj, Spritesheet.Category category) {
@@ -46,13 +37,13 @@ public class SpriteChooser extends JDialog {
cache.get(proj).put(category, new SpriteChooser(proj, category)); cache.get(proj).put(category, new SpriteChooser(proj, category));
} else { } else {
List<Spritesheet> spritesheets = new ArrayList<Spritesheet>(); List<Spritesheet> spritesheets = new ArrayList<Spritesheet>();
for (int i=0; i<proj.getSpritesheetCount(); i++) { for (int i = 0; i < proj.getSpritesheetCount(); i++) {
Spritesheet sheet = proj.getSpritesheet(i); Spritesheet sheet = proj.getSpritesheet(i);
if (sheet.category == category) { if (sheet.category == category) {
spritesheets.add(sheet); spritesheets.add(sheet);
} }
} }
if ( !spritesheets.equals(cacheValidator.get(proj).get(category)) ) { if (!spritesheets.equals(cacheValidator.get(proj).get(category))) {
cache.get(proj).put(category, new SpriteChooser(proj, category)); cache.get(proj).put(category, new SpriteChooser(proj, category));
} }
} }
@@ -78,7 +69,7 @@ public class SpriteChooser extends JDialog {
setTitle("Select a sprite"); setTitle("Select a sprite");
setModalityType(ModalityType.APPLICATION_MODAL); setModalityType(ModalityType.APPLICATION_MODAL);
List<Spritesheet> spritesheets = new ArrayList<Spritesheet>(); List<Spritesheet> spritesheets = new ArrayList<Spritesheet>();
for (int i=0; i<proj.getSpritesheetCount(); i++) { for (int i = 0; i < proj.getSpritesheetCount(); i++) {
Spritesheet sheet = proj.getSpritesheet(i); Spritesheet sheet = proj.getSpritesheet(i);
if (sheet.category == category) { if (sheet.category == category) {
spritesheets.add(sheet); spritesheets.add(sheet);
@@ -120,7 +111,7 @@ public class SpriteChooser extends JDialog {
c.gridx = 0; c.gridx = 0;
c.gridy++; c.gridy++;
} }
nextFreeSlot.setLocation(c.gridx, c.gridy); nextFreeSlot.setLocation(c.gridx, c.gridy);
} else { } else {
c.gridwidth = (sheet.spriteWidth / STD_WIDTH) + (sheet.spriteWidth % STD_WIDTH == 0 ? 0 : 1); c.gridwidth = (sheet.spriteWidth / STD_WIDTH) + (sheet.spriteWidth % STD_WIDTH == 0 ? 0 : 1);
c.gridheight = (sheet.spriteHeight / STD_HEIGHT) + (sheet.spriteHeight % STD_HEIGHT == 0 ? 0 : 1); c.gridheight = (sheet.spriteHeight / STD_HEIGHT) + (sheet.spriteHeight % STD_HEIGHT == 0 ? 0 : 1);
@@ -157,7 +148,7 @@ public class SpriteChooser extends JDialog {
c.gridx = 0; c.gridx = 0;
c.gridy++; c.gridy++;
} }
nextFreeSlot.setLocation(c.gridx, c.gridy); nextFreeSlot.setLocation(c.gridx, c.gridy);
} }
i++; i++;
} }
@@ -232,12 +223,12 @@ public class SpriteChooser extends JDialog {
super(new ImageIcon(img)); super(new ImageIcon(img));
this.sheetId = sheetId; this.sheetId = sheetId;
this.spriteIndex = spriteIndex; this.spriteIndex = spriteIndex;
setToolTipText(sheetId+":"+spriteIndex); setToolTipText(sheetId + ":" + spriteIndex);
addActionListener(new ActionListener() { addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
if (IconButton.this.isSelected()) { if (IconButton.this.isSelected()) {
selectedIconId = IconButton.this.sheetId+":"+IconButton.this.spriteIndex; selectedIconId = IconButton.this.sheetId + ":" + IconButton.this.spriteIndex;
SpriteChooser.this.setVisible(false); SpriteChooser.this.setVisible(false);
SpriteChooser.this.dispose(); SpriteChooser.this.dispose();
if (listener != null) listener.iconSelected(selectedIconId); if (listener != null) listener.iconSelected(selectedIconId);