style(Google Java Format): Apply Google Java format to sources, refor…

…mat and optimize imports. Add editorconfig and project config
Griefed · Jun 4, 2022 · 7eea595 · 7eea595
1 parent dadfe85
commit 7eea595
Show file tree

Hide file tree

Showing 19 changed files with 4,234 additions and 612 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/Project.xml b/Project.xml
diff --git a/backend/main/java/de/griefed/serverpackcreator/swing/utilities/RotatedIcon.java b/backend/main/java/de/griefed/serverpackcreator/swing/utilities/RotatedIcon.java
@@ -58,8 +58,6 @@
  * Heya, Griefed here. This is yet another miracle by Rob Camick. This man is a godsend.<br>
  * See <a href="https://tips4java.wordpress.com/2009/04/06/rotated-icon/">Rotated Icon</a><br>
  *
- * <p>
- *
  * <p>The RotatedIcon allows you to change the orientation of an Icon by rotating the Icon before it
  * is painted. This class supports the following orientations:
  *
@@ -73,8 +71,8 @@
  * @author Rob Camick
  */
 public class RotatedIcon implements Icon {
-  private Icon icon;
-  private Rotate rotate;
+  private final Icon icon;
+  private final Rotate rotate;
   private double degrees;
   private boolean circularIcon;
 
@@ -194,8 +192,7 @@ public int getIconWidth() {
         double radians = Math.toRadians(degrees);
         double sin = Math.abs(Math.sin(radians));
         double cos = Math.abs(Math.cos(radians));
-        int width = (int) Math.floor(icon.getIconWidth() * cos + icon.getIconHeight() * sin);
-        return width;
+        return (int) Math.floor(icon.getIconWidth() * cos + icon.getIconHeight() * sin);
       }
     } else if (rotate == Rotate.UPSIDE_DOWN) return icon.getIconWidth();
     else return icon.getIconHeight();
@@ -218,8 +215,7 @@ public int getIconHeight() {
         double radians = Math.toRadians(degrees);
         double sin = Math.abs(Math.sin(radians));
         double cos = Math.abs(Math.cos(radians));
-        int height = (int) Math.floor(icon.getIconHeight() * cos + icon.getIconWidth() * sin);
-        return height;
+        return (int) Math.floor(icon.getIconHeight() * cos + icon.getIconWidth() * sin);
       }
     } else if (rotate == Rotate.UPSIDE_DOWN) return icon.getIconHeight();
     else return icon.getIconWidth();

diff --git a/frontend/.editorconfig b/frontend/.editorconfig
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import { defineComponent, provide } from 'vue';
+import {defineComponent, provide} from 'vue';
 import store from './store';
 
 export default defineComponent({

diff --git a/frontend/src/assets/icon.svg b/frontend/src/assets/icon.svg
diff --git a/frontend/src/assets/sad.svg b/frontend/src/assets/sad.svg
diff --git a/frontend/src/boot/axios.js b/frontend/src/boot/axios.js
@@ -1,4 +1,4 @@
-import { boot } from 'quasar/wrappers';
+import {boot} from 'quasar/wrappers';
 import axios from 'axios';
 
 // Be careful when using SSR for cross-request state pollution
@@ -8,15 +8,15 @@ import axios from 'axios';
 // "export default () => {}" function below (which runs individually
 // for each client)
 const api = axios.create(
-  {
-    baseURL: '/api/v1',
-    headers: {
-      "Content-type": "application/json"
+    {
+      baseURL: '/api/v1',
+      headers: {
+        "Content-type": "application/json"
+      }
     }
-  }
 );
 
-export default boot(({ app }) => {
+export default boot(({app}) => {
   // for use inside Vue files (Options API) through this.$axios and this.$api
 
   app.config.globalProperties.$axios = axios;
@@ -28,4 +28,4 @@ export default boot(({ app }) => {
   //       so you can easily perform requests against your app's API
 });
 
-export { axios,api };
+export {axios, api};
diff --git a/frontend/src/css/quasar.variables.sass b/frontend/src/css/quasar.variables.sass
@@ -12,13 +12,13 @@
 // to match your app's branding.
 // Tip: Use the "Theme Builder" on Quasar's documentation website.
 
-$primary   : #325358
-$secondary : #54a896
-$accent    : #6a1a78
+$primary: #325358
+$secondary: #54a896
+$accent: #6a1a78
 
-$dark      : #1d1d1d
+$dark: #1d1d1d
 
-$positive  : #21BA45
-$negative  : #C10015
-$info      : #31CCEC
-$warning   : #cea32b
+$positive: #21BA45
+$negative: #C10015
+$info: #31CCEC
+$warning: #cea32b
diff --git a/frontend/src/index.template.html b/frontend/src/index.template.html
@@ -1,33 +1,34 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title><%= productName %></title>
+  <title><%= productName %></title>
 
-    <meta charset="utf-8">
-    <meta content="<%= productDescription %>" name="description">
-    <meta content="telephone=no" name="format-detection">
-    <meta content="no" name="msapplication-tap-highlight">
-    <meta content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
-          name="viewport">
+  <meta charset="utf-8">
+  <meta content="<%= productDescription %>" name="description">
+  <meta content="telephone=no" name="format-detection">
+  <meta content="no" name="msapplication-tap-highlight">
+  <meta
+      content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
+      name="viewport">
 
-    <meta content="icons/ms-icon-144x144.png" name="msapplication-TileImage">
+  <meta content="icons/ms-icon-144x144.png" name="msapplication-TileImage">
 
-    <link href="icons/apple-icon-57x57.png" rel="apple-touch-icon" sizes="57x57">
-    <link href="icons/apple-icon-60x60.png" rel="apple-touch-icon" sizes="60x60">
-    <link href="icons/apple-icon-72x72.png" rel="apple-touch-icon" sizes="72x72">
-    <link href="icons/apple-icon-76x76.png" rel="apple-touch-icon" sizes="76x76">
-    <link href="icons/apple-icon-114x114.png" rel="apple-touch-icon" sizes="114x114">
-    <link href="icons/apple-icon-120x120.png" rel="apple-touch-icon" sizes="120x120">
-    <link href="icons/apple-icon-144x144.png" rel="apple-touch-icon" sizes="144x144">
-    <link href="icons/apple-icon-152x152.png" rel="apple-touch-icon" sizes="152x152">
-    <link href="icons/apple-icon-180x180.png" rel="apple-touch-icon" sizes="180x180">
+  <link href="icons/apple-icon-57x57.png" rel="apple-touch-icon" sizes="57x57">
+  <link href="icons/apple-icon-60x60.png" rel="apple-touch-icon" sizes="60x60">
+  <link href="icons/apple-icon-72x72.png" rel="apple-touch-icon" sizes="72x72">
+  <link href="icons/apple-icon-76x76.png" rel="apple-touch-icon" sizes="76x76">
+  <link href="icons/apple-icon-114x114.png" rel="apple-touch-icon" sizes="114x114">
+  <link href="icons/apple-icon-120x120.png" rel="apple-touch-icon" sizes="120x120">
+  <link href="icons/apple-icon-144x144.png" rel="apple-touch-icon" sizes="144x144">
+  <link href="icons/apple-icon-152x152.png" rel="apple-touch-icon" sizes="152x152">
+  <link href="icons/apple-icon-180x180.png" rel="apple-touch-icon" sizes="180x180">
 
-    <link href="icons/android-icon-192x192.png" rel="icon" sizes="192x192" type="image/png">
-    <link href="icons/favicon-128x128.png" rel="icon" sizes="128x128" type="image/png">
-    <link href="icons/favicon-96x96.png" rel="icon" sizes="96x96" type="image/png">
-    <link href="icons/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
-    <link href="icons/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
-    <link href="icons/favicon.ico" rel="icon" type="image/ico">
+  <link href="icons/android-icon-192x192.png" rel="icon" sizes="192x192" type="image/png">
+  <link href="icons/favicon-128x128.png" rel="icon" sizes="128x128" type="image/png">
+  <link href="icons/favicon-96x96.png" rel="icon" sizes="96x96" type="image/png">
+  <link href="icons/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
+  <link href="icons/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
+  <link href="icons/favicon.ico" rel="icon" type="image/ico">
 </head>
 <body>
 <!-- DO NOT touch the following DIV -->