From 16c5d7b2d0d4ae3546d0287da28e820d3f8cd502 Mon Sep 17 00:00:00 2001 From: Bjorn Pijnacker Date: Tue, 23 Feb 2021 16:19:05 +0100 Subject: [PATCH] changed spaces to tabs I have honestly no idea why it wasn't autodetecting the use of tabs --- .../erme/EntityRelationMappingEditor.java | 46 ++--- .../erme/control/actions/LolcatAction.java | 30 ++-- .../view/view_models/AttributeViewModel.java | 166 +++++++++--------- 3 files changed, 121 insertions(+), 121 deletions(-) diff --git a/src/main/java/nl/andrewlalis/erme/EntityRelationMappingEditor.java b/src/main/java/nl/andrewlalis/erme/EntityRelationMappingEditor.java index e50e30b..48a8243 100644 --- a/src/main/java/nl/andrewlalis/erme/EntityRelationMappingEditor.java +++ b/src/main/java/nl/andrewlalis/erme/EntityRelationMappingEditor.java @@ -7,30 +7,30 @@ import nl.andrewlalis.erme.view.EditorFrame; import java.nio.charset.StandardCharsets; public class EntityRelationMappingEditor { - public static final String VERSION = "1.3.1"; - private static EditorFrame frame; + public static final String VERSION = "1.3.1"; + private static EditorFrame frame; - public static EditorFrame getFrame() { - return frame; - } + public static EditorFrame getFrame() { + return frame; + } - public static void main(String[] args) { - if (!FlatLightLaf.install()) { - System.err.println("Could not install FlatLight Look and Feel."); - } - final boolean includeAdminActions = shouldIncludeAdminActions(args); - if (includeAdminActions) { - System.out.println("Admin actions have been enabled."); - } - frame = new EditorFrame(includeAdminActions); - frame.setVisible(true); - } + public static void main(String[] args) { + if (!FlatLightLaf.install()) { + System.err.println("Could not install FlatLight Look and Feel."); + } + final boolean includeAdminActions = shouldIncludeAdminActions(args); + if (includeAdminActions) { + System.out.println("Admin actions have been enabled."); + } + frame = new EditorFrame(includeAdminActions); + frame.setVisible(true); + } - private static boolean shouldIncludeAdminActions(String[] args) { - if (args.length < 1) { - return false; - } - byte[] pw = args[0].getBytes(StandardCharsets.UTF_8); - return Hash.matches(pw, "admin_hash.txt"); - } + private static boolean shouldIncludeAdminActions(String[] args) { + if (args.length < 1) { + return false; + } + byte[] pw = args[0].getBytes(StandardCharsets.UTF_8); + return Hash.matches(pw, "admin_hash.txt"); + } } diff --git a/src/main/java/nl/andrewlalis/erme/control/actions/LolcatAction.java b/src/main/java/nl/andrewlalis/erme/control/actions/LolcatAction.java index 7fc7d94..d3a9925 100644 --- a/src/main/java/nl/andrewlalis/erme/control/actions/LolcatAction.java +++ b/src/main/java/nl/andrewlalis/erme/control/actions/LolcatAction.java @@ -7,21 +7,21 @@ import javax.swing.*; import java.awt.event.ActionEvent; public class LolcatAction extends AbstractAction { - private static LolcatAction instance; - public static LolcatAction getInstance() { - if (instance == null) { - instance = new LolcatAction(); - } - return instance; - } + private static LolcatAction instance; + public static LolcatAction getInstance() { + if (instance == null) { + instance = new LolcatAction(); + } + return instance; + } - public LolcatAction() { - super("Toggle Lolcat Mode"); - } + public LolcatAction() { + super("Toggle Lolcat Mode"); + } - @Override - public void actionPerformed(ActionEvent actionEvent) { - AttributeViewModel.setLolcatMode(((AbstractButton)actionEvent.getSource()).getModel().isSelected()); - EntityRelationMappingEditor.getFrame().getContentPane().repaint(); - } + @Override + public void actionPerformed(ActionEvent actionEvent) { + AttributeViewModel.setLolcatMode(((AbstractButton)actionEvent.getSource()).getModel().isSelected()); + EntityRelationMappingEditor.getFrame().getContentPane().repaint(); + } } diff --git a/src/main/java/nl/andrewlalis/erme/view/view_models/AttributeViewModel.java b/src/main/java/nl/andrewlalis/erme/view/view_models/AttributeViewModel.java index e82d6c6..595b866 100644 --- a/src/main/java/nl/andrewlalis/erme/view/view_models/AttributeViewModel.java +++ b/src/main/java/nl/andrewlalis/erme/view/view_models/AttributeViewModel.java @@ -15,98 +15,98 @@ import java.text.AttributedString; * View model for rendering a single attribute of a relation. */ public class AttributeViewModel implements ViewModel { - public static final int PADDING_X = 5; - public static final int PADDING_Y = 5; - public static final Color BACKGROUND_COLOR = Color.LIGHT_GRAY; - public static final Color FONT_COLOR = Color.BLACK; - public static final float FK_FONT_SIZE = 11.0f; - private static final float LOLCAT_SAT = 0.75f; - private static final float LOLCAT_BRIGHT = 1f; - private static boolean lolcatMode; - private final Attribute attribute; + public static final int PADDING_X = 5; + public static final int PADDING_Y = 5; + public static final Color BACKGROUND_COLOR = Color.LIGHT_GRAY; + public static final Color FONT_COLOR = Color.BLACK; + public static final float FK_FONT_SIZE = 11.0f; + private static final float LOLCAT_SAT = 0.75f; + private static final float LOLCAT_BRIGHT = 1f; + private static boolean lolcatMode; + private final Attribute attribute; - public AttributeViewModel(Attribute attribute) { - this.attribute = attribute; - } + public AttributeViewModel(Attribute attribute) { + this.attribute = attribute; + } - public static boolean getLolcatMode() { - return lolcatMode; - } + public static boolean getLolcatMode() { + return lolcatMode; + } - public static void setLolcatMode(boolean lolcatMode) { - AttributeViewModel.lolcatMode = lolcatMode; - } + public static void setLolcatMode(boolean lolcatMode) { + AttributeViewModel.lolcatMode = lolcatMode; + } - @Override - public void draw(Graphics2D g) { - AttributedString as = this.getAttributedString(g); - Rectangle r = this.getBounds(g, as); - g.setColor(this.getBackgroundColor(r.x + r.width / 2, r.y + r.height / 2, g)); - g.fillRect(r.x, r.y, r.width, r.height); - g.setColor(FONT_COLOR); - g.drawRect(r.x, r.y, r.width, r.height); - g.drawString(as.getIterator(), r.x + PADDING_X, r.y + (r.height - PADDING_Y)); - if (this.attribute instanceof ForeignKeyAttribute) { - ForeignKeyAttribute fkAttribute = (ForeignKeyAttribute) this.attribute; - Font originalFont = g.getFont(); - g.setFont(g.getFont().deriveFont(Font.ITALIC, FK_FONT_SIZE)); - g.drawString(fkAttribute.getFullReferenceName(), r.x + PADDING_X, r.y - PADDING_Y); - g.setFont(originalFont); - } - } + @Override + public void draw(Graphics2D g) { + AttributedString as = this.getAttributedString(g); + Rectangle r = this.getBounds(g, as); + g.setColor(this.getBackgroundColor(r.x + r.width / 2, r.y + r.height / 2, g)); + g.fillRect(r.x, r.y, r.width, r.height); + g.setColor(FONT_COLOR); + g.drawRect(r.x, r.y, r.width, r.height); + g.drawString(as.getIterator(), r.x + PADDING_X, r.y + (r.height - PADDING_Y)); + if (this.attribute instanceof ForeignKeyAttribute) { + ForeignKeyAttribute fkAttribute = (ForeignKeyAttribute) this.attribute; + Font originalFont = g.getFont(); + g.setFont(g.getFont().deriveFont(Font.ITALIC, FK_FONT_SIZE)); + g.drawString(fkAttribute.getFullReferenceName(), r.x + PADDING_X, r.y - PADDING_Y); + g.setFont(originalFont); + } + } - private Color getBackgroundColor(int x, int y, Graphics2D g) { - if (!lolcatMode) return BACKGROUND_COLOR; - Dimension viewportSize = ((DiagramPanel)EntityRelationMappingEditor.getFrame().getContentPane()).getModel().getRelationBounds().getSize(); + private Color getBackgroundColor(int x, int y, Graphics2D g) { + if (!lolcatMode) return BACKGROUND_COLOR; + Dimension viewportSize = ((DiagramPanel)EntityRelationMappingEditor.getFrame().getContentPane()).getModel().getRelationBounds().getSize(); - double dx = viewportSize.width; - double dy = viewportSize.height; - double mag = Math.sqrt(dx * dx + dy * dy); - dx /= mag; - dy /= mag; + double dx = viewportSize.width; + double dy = viewportSize.height; + double mag = Math.sqrt(dx * dx + dy * dy); + dx /= mag; + dy /= mag; - double lambda = (dx * x + dy * y); - double diag_val = Math.sqrt(Math.pow(dx * lambda, 2) + Math.pow(dy * lambda, 2)) / mag; + double lambda = (dx * x + dy * y); + double diag_val = Math.sqrt(Math.pow(dx * lambda, 2) + Math.pow(dy * lambda, 2)) / mag; - return Color.getHSBColor((float) diag_val, LOLCAT_SAT, LOLCAT_BRIGHT); - } + return Color.getHSBColor((float) diag_val, LOLCAT_SAT, LOLCAT_BRIGHT); + } - @Override - public Rectangle getBounds(Graphics2D g) { - return this.getBounds(g, this.getAttributedString(g)); - } + @Override + public Rectangle getBounds(Graphics2D g) { + return this.getBounds(g, this.getAttributedString(g)); + } - private Rectangle getBounds(Graphics2D g, AttributedString as) { - final RelationViewModel relationViewModel = (RelationViewModel) this.attribute.getRelation().getViewModel(); - int x = this.attribute.getRelation().getPosition().x + RelationViewModel.PADDING_X; - int y = this.attribute.getRelation().getPosition().y + relationViewModel.getNameBounds(g).height + RelationViewModel.ATTRIBUTE_SEPARATION; - int i = 0; - while (!this.attribute.getRelation().getAttributes().get(i).equals(this.attribute)) { - x += this.attribute.getRelation().getAttributes().get(i).getViewModel().getBounds(g).width; - i++; - } - Rectangle2D nameRect = g.getFontMetrics().getStringBounds(as.getIterator(), 0, this.attribute.getName().length(), g); - int width = (int) nameRect.getWidth() + (2 * PADDING_X); - int height = (int) nameRect.getHeight() + (2 * PADDING_Y); - if (this.attribute instanceof ForeignKeyAttribute) { - ForeignKeyAttribute fkAttribute = (ForeignKeyAttribute) this.attribute; - Font originalFont = g.getFont(); - g.setFont(g.getFont().deriveFont(Font.ITALIC, FK_FONT_SIZE)); - Rectangle referenceNameBounds = g.getFontMetrics().getStringBounds(fkAttribute.getFullReferenceName(), g).getBounds(); - g.setFont(originalFont); - width = Math.max(width, referenceNameBounds.width + (2 * PADDING_X)); - } - return new Rectangle(x, y, width, height); - } + private Rectangle getBounds(Graphics2D g, AttributedString as) { + final RelationViewModel relationViewModel = (RelationViewModel) this.attribute.getRelation().getViewModel(); + int x = this.attribute.getRelation().getPosition().x + RelationViewModel.PADDING_X; + int y = this.attribute.getRelation().getPosition().y + relationViewModel.getNameBounds(g).height + RelationViewModel.ATTRIBUTE_SEPARATION; + int i = 0; + while (!this.attribute.getRelation().getAttributes().get(i).equals(this.attribute)) { + x += this.attribute.getRelation().getAttributes().get(i).getViewModel().getBounds(g).width; + i++; + } + Rectangle2D nameRect = g.getFontMetrics().getStringBounds(as.getIterator(), 0, this.attribute.getName().length(), g); + int width = (int) nameRect.getWidth() + (2 * PADDING_X); + int height = (int) nameRect.getHeight() + (2 * PADDING_Y); + if (this.attribute instanceof ForeignKeyAttribute) { + ForeignKeyAttribute fkAttribute = (ForeignKeyAttribute) this.attribute; + Font originalFont = g.getFont(); + g.setFont(g.getFont().deriveFont(Font.ITALIC, FK_FONT_SIZE)); + Rectangle referenceNameBounds = g.getFontMetrics().getStringBounds(fkAttribute.getFullReferenceName(), g).getBounds(); + g.setFont(originalFont); + width = Math.max(width, referenceNameBounds.width + (2 * PADDING_X)); + } + return new Rectangle(x, y, width, height); + } - private AttributedString getAttributedString(Graphics2D g) { - AttributedString as = new AttributedString(this.attribute.getName()); - as.addAttribute(TextAttribute.FONT, g.getFont()); - if (this.attribute.getType().equals(AttributeType.ID_KEY)) { - as.addAttribute(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON); - } else if (this.attribute.getType().equals(AttributeType.PARTIAL_ID_KEY)) { - as.addAttribute(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_LOW_DASHED); - } - return as; - } + private AttributedString getAttributedString(Graphics2D g) { + AttributedString as = new AttributedString(this.attribute.getName()); + as.addAttribute(TextAttribute.FONT, g.getFont()); + if (this.attribute.getType().equals(AttributeType.ID_KEY)) { + as.addAttribute(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON); + } else if (this.attribute.getType().equals(AttributeType.PARTIAL_ID_KEY)) { + as.addAttribute(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_LOW_DASHED); + } + return as; + } }