Browse Source

remove eclipse stuff, rework java sources for idea

Andrew Dolgov 5 years ago
parent
commit
75e7c58682

+ 0 - 14
.externalToolBuilders/Ant_Builder.launch

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tt-irc"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/tt-irc/build.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/tt-irc}"/>
-</launchConfiguration>

+ 4 - 0
.gitignore

@@ -1,3 +1,5 @@
+.idea/workspace.xml
+.idea/tasks.xml
 local.css
 local_notheme.css
 local.js
@@ -6,6 +8,8 @@ config.php
 messages.pot
 messages.mo
 lib/*.jar
+out
+daemon/libs/*.jar
 build.number
 lock/*.lock
 emoticons/*.gif

+ 1 - 0
.idea/.name

@@ -0,0 +1 @@
+tt-irc

+ 22 - 0
.idea/compiler.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
+    </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>

+ 3 - 0
.idea/copyright/profiles_settings.xml

@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="" />
+</component>

+ 9 - 0
.idea/libraries/irclib.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="irclib">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/daemon/libs/irclib.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/json_simple_1_1.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="json_simple-1.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/daemon/libs/json_simple-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/postgresql_8_4_701_jdbc4.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="postgresql-8.4-701.jdbc4">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/daemon/libs/postgresql-8.4-701.jdbc4.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 19 - 0
.idea/misc.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

+ 8 - 0
.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/daemon/daemon.iml" filepath="$PROJECT_DIR$/daemon/daemon.iml" />
+    </modules>
+  </component>
+</project>

+ 6 - 0
.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

+ 0 - 27
.project

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>tt-irc</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/Ant_Builder.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

+ 4 - 3
build.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <project name="tt-irc" default="default">
 
-	<property name="src" location="src"/>
-	<property name="bin" location="bin"/>
+	<property name="src" location="daemon/src"/>
+	<property name="bin" location="out/production/daemon"/>
 
 	<path id="project.libpath">
-		<fileset dir="lib/">
+		<fileset dir="daemon/libs/">
 			<include name="**/*.jar"/>
 		</fileset>
 	</path>
@@ -53,6 +53,7 @@
 
 		<jar destfile="backend.jar" basedir="bin" includes="**/*.class"
 				manifest="manifest.mf"/>
+		<zipgroupfileset dir="${project.libpath}" includes="**/*.jar" />
 	</target>
 
 	<target name="clean">

+ 14 - 0
daemon/daemon.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="irclib" level="project" />
+    <orderEntry type="library" name="json_simple-1.1" level="project" />
+    <orderEntry type="library" name="postgresql-8.4-701.jdbc4" level="project" />
+  </component>
+</module>

+ 0 - 0
src/org/fox/ttirc/ConnectionHandler.java → daemon/src/org/fox/ttirc/ConnectionHandler.java


+ 0 - 0
src/org/fox/ttirc/Constants.java → daemon/src/org/fox/ttirc/Constants.java


+ 0 - 0
src/org/fox/ttirc/ExtNickInfo.java → daemon/src/org/fox/ttirc/ExtNickInfo.java


+ 0 - 0
src/org/fox/ttirc/Master.java → daemon/src/org/fox/ttirc/Master.java


+ 0 - 0
src/org/fox/ttirc/NativeConnectionHandler.java → daemon/src/org/fox/ttirc/NativeConnectionHandler.java


+ 0 - 0
src/org/fox/ttirc/NickList.java → daemon/src/org/fox/ttirc/NickList.java


+ 0 - 0
src/org/fox/ttirc/SystemConnectionHandler.java → daemon/src/org/fox/ttirc/SystemConnectionHandler.java