From e72bb5130866337c1b3c09e2fc2e61e4099635a7 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 10 Sep 2019 23:47:06 +0300 Subject: [PATCH] initial project setup and updated git ignore --- .gitignore | 91 +++++++++++++++++++ Main/pom.xml | 6 ++ .../java/Classes/MetaClass/Singleton.java | 9 ++ .../main/java/Classes/SettingsManager.java | 7 ++ .../src/main/java/Handlers/Vision/Camera.java | 4 + .../java/Handlers/Vision/VisionProcess.java | 4 + Main/src/main/java/Handlers/Web/Server.java | 9 ++ Main/src/main/java/Handlers/Web/Socket.java | 5 + Main/src/main/java/Handlers/Web/Web.java | 5 + Main/src/main/java/Main.java | 4 +- 10 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 Main/src/main/java/Classes/MetaClass/Singleton.java create mode 100644 Main/src/main/java/Classes/SettingsManager.java create mode 100644 Main/src/main/java/Handlers/Vision/Camera.java create mode 100644 Main/src/main/java/Handlers/Vision/VisionProcess.java create mode 100644 Main/src/main/java/Handlers/Web/Server.java create mode 100644 Main/src/main/java/Handlers/Web/Socket.java create mode 100644 Main/src/main/java/Handlers/Web/Web.java diff --git a/.gitignore b/.gitignore index 8c2e3d3d4..b40a187ee 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,94 @@ Python/app/handlers/__pycache__/ backend/settings/ /.vscode/ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser diff --git a/Main/pom.xml b/Main/pom.xml index 238c54d80..5362f03bf 100644 --- a/Main/pom.xml +++ b/Main/pom.xml @@ -40,6 +40,12 @@ json RELEASE + + + org.slf4j + slf4j-simple + 1.7.26 + edu.wpi.first.cscore diff --git a/Main/src/main/java/Classes/MetaClass/Singleton.java b/Main/src/main/java/Classes/MetaClass/Singleton.java new file mode 100644 index 000000000..75d58cffa --- /dev/null +++ b/Main/src/main/java/Classes/MetaClass/Singleton.java @@ -0,0 +1,9 @@ +package Classes.MetaClass; + +public class Singleton { + private static Singleton single_instance = new Singleton(); + + public static Singleton getInstance(){ + return single_instance; + } +} diff --git a/Main/src/main/java/Classes/SettingsManager.java b/Main/src/main/java/Classes/SettingsManager.java new file mode 100644 index 000000000..85b98e95b --- /dev/null +++ b/Main/src/main/java/Classes/SettingsManager.java @@ -0,0 +1,7 @@ +package Classes; + +import Classes.MetaClass.Singleton; +public class SettingsManager extends Singleton { + public static int x = 5; // example of how to setup variable in singleton + +} diff --git a/Main/src/main/java/Handlers/Vision/Camera.java b/Main/src/main/java/Handlers/Vision/Camera.java new file mode 100644 index 000000000..278951580 --- /dev/null +++ b/Main/src/main/java/Handlers/Vision/Camera.java @@ -0,0 +1,4 @@ +package Handlers.Vision; + +public class Camera { +} diff --git a/Main/src/main/java/Handlers/Vision/VisionProcess.java b/Main/src/main/java/Handlers/Vision/VisionProcess.java new file mode 100644 index 000000000..2664efff1 --- /dev/null +++ b/Main/src/main/java/Handlers/Vision/VisionProcess.java @@ -0,0 +1,4 @@ +package Handlers.Vision; + +public class VisionProcess { +} diff --git a/Main/src/main/java/Handlers/Web/Server.java b/Main/src/main/java/Handlers/Web/Server.java new file mode 100644 index 000000000..6d77fe86e --- /dev/null +++ b/Main/src/main/java/Handlers/Web/Server.java @@ -0,0 +1,9 @@ +package Handlers.Web; + +import io.javalin.Javalin; +public class Server { + public static void main(int port) { + Javalin app = Javalin.create().start(port); + app.get("/", ctx -> ctx.result("Hello World")); + } +} diff --git a/Main/src/main/java/Handlers/Web/Socket.java b/Main/src/main/java/Handlers/Web/Socket.java new file mode 100644 index 000000000..b50441e6f --- /dev/null +++ b/Main/src/main/java/Handlers/Web/Socket.java @@ -0,0 +1,5 @@ +package Handlers.Web; + +public class Socket { + +} diff --git a/Main/src/main/java/Handlers/Web/Web.java b/Main/src/main/java/Handlers/Web/Web.java new file mode 100644 index 000000000..ecf9e3a02 --- /dev/null +++ b/Main/src/main/java/Handlers/Web/Web.java @@ -0,0 +1,5 @@ +package Handlers.Web; + +public class Web { + +} diff --git a/Main/src/main/java/Main.java b/Main/src/main/java/Main.java index e0067d673..19e002a18 100644 --- a/Main/src/main/java/Main.java +++ b/Main/src/main/java/Main.java @@ -1,6 +1,6 @@ - public class Main { - public static void main(String [] args){ + public static void main(String [] args) { } } +