mirror
/
DMDirc-Client
zrcadlo https://github.com/DMDirc/DMDirc.git
Sledovat 1
Oblíbit 0
Rozštěpit 0
Zdrojový kód Úkoly 0 Vydání 49 Wiki Aktivita
Procházet zdrojové kódy

Change IDEA build scripts. 

Change-Id: I0029e3333815461acbbb4917e1c88a05ee6f5d73
Reviewed-on: http://gerrit.dmdirc.com/3929
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>
pull/1/head
Greg Holmes před 9 roky
rodič
8c8a7a3608
revize
98f2e7bbef
10 změnil soubory, kde provedl 168 přidání a 129 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 50
    0
      .idea/gradle.xml
  2. 43
    1
      .idea/modules.xml
  3. 7
    4
      .idea/parser.iml
  4. 1
    102
      .idea/plugins.iml
  5. 1
    0
      .idea/runConfigurations/All_tests.xml
  6. 1
    0
      .idea/runConfigurations/DMDirc.xml
  7. 8
    4
      .idea/util.iml
  8. 12
    0
      .idea/vcs.xml
  9. 20
    18
      DMDirc.iml
  10. 25
    0
      modules/modules.iml

+ 50
- 0
.idea/gradle.xml Zobrazit soubor 

@@ -14,6 +14,56 @@
14 14 
           </set>
15 15 
         </option>
16 16 
       </GradleProjectSettings>
17 
+      <GradleProjectSettings>
18 
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
19 
+        <option name="externalProjectPath" value="$PROJECT_DIR$/modules/plugins" />
20 
+        <option name="modules">
21 
+          <set>
22 
+            <option value="$PROJECT_DIR$/modules/plugins" />
23 
+            <option value="$PROJECT_DIR$/modules/plugins/activewindow" />
24 
+            <option value="$PROJECT_DIR$/modules/plugins/audio" />
25 
+            <option value="$PROJECT_DIR$/modules/plugins/calc" />
26 
+            <option value="$PROJECT_DIR$/modules/plugins/conditional_execute" />
27 
+            <option value="$PROJECT_DIR$/modules/plugins/contactlist" />
28 
+            <option value="$PROJECT_DIR$/modules/plugins/dcc" />
29 
+            <option value="$PROJECT_DIR$/modules/plugins/dcop" />
30 
+            <option value="$PROJECT_DIR$/modules/plugins/debug" />
31 
+            <option value="$PROJECT_DIR$/modules/plugins/dns" />
32 
+            <option value="$PROJECT_DIR$/modules/plugins/exec" />
33 
+            <option value="$PROJECT_DIR$/modules/plugins/freedesktop_notifications" />
34 
+            <option value="$PROJECT_DIR$/modules/plugins/identd" />
35 
+            <option value="$PROJECT_DIR$/modules/plugins/lagdisplay" />
36 
+            <option value="$PROJECT_DIR$/modules/plugins/logging" />
37 
+            <option value="$PROJECT_DIR$/modules/plugins/mediasource_dbus" />
38 
+            <option value="$PROJECT_DIR$/modules/plugins/mediasource_dcop" />
39 
+            <option value="$PROJECT_DIR$/modules/plugins/mediasource_linux_title" />
40 
+            <option value="$PROJECT_DIR$/modules/plugins/mediasource_mplayer" />
41 
+            <option value="$PROJECT_DIR$/modules/plugins/mediasource_vlc" />
42 
+            <option value="$PROJECT_DIR$/modules/plugins/mediasource_windows" />
43 
+            <option value="$PROJECT_DIR$/modules/plugins/nickcolours" />
44 
+            <option value="$PROJECT_DIR$/modules/plugins/nma" />
45 
+            <option value="$PROJECT_DIR$/modules/plugins/notifications" />
46 
+            <option value="$PROJECT_DIR$/modules/plugins/nowplaying" />
47 
+            <option value="$PROJECT_DIR$/modules/plugins/osd" />
48 
+            <option value="$PROJECT_DIR$/modules/plugins/osx_integration" />
49 
+            <option value="$PROJECT_DIR$/modules/plugins/parser_irc" />
50 
+            <option value="$PROJECT_DIR$/modules/plugins/parser_xmpp" />
51 
+            <option value="$PROJECT_DIR$/modules/plugins/parserdebug" />
52 
+            <option value="$PROJECT_DIR$/modules/plugins/redirect" />
53 
+            <option value="$PROJECT_DIR$/modules/plugins/scriptplugin" />
54 
+            <option value="$PROJECT_DIR$/modules/plugins/serverlistdialog" />
55 
+            <option value="$PROJECT_DIR$/modules/plugins/serverlists" />
56 
+            <option value="$PROJECT_DIR$/modules/plugins/sessionlock" />
57 
+            <option value="$PROJECT_DIR$/modules/plugins/systray" />
58 
+            <option value="$PROJECT_DIR$/modules/plugins/tabcompletion_bash" />
59 
+            <option value="$PROJECT_DIR$/modules/plugins/tabcompletion_mirc" />
60 
+            <option value="$PROJECT_DIR$/modules/plugins/time" />
61 
+            <option value="$PROJECT_DIR$/modules/plugins/ui_swing" />
62 
+            <option value="$PROJECT_DIR$/modules/plugins/windowflashing" />
63 
+            <option value="$PROJECT_DIR$/modules/plugins/windowstatus" />
64 
+          </set>
65 
+        </option>
66 
+      </GradleProjectSettings>
17 67 
     </option>
18 68 
   </component>
19 69 
 </project>

+ 43
- 1
.idea/modules.xml Zobrazit soubor 

@@ -2,10 +2,52 @@
2 2 
 <project version="4">
3 3 
   <component name="ProjectModuleManager">
4 4 
     <modules>
5 
-      <module fileurl="file://$PROJECT_DIR$/DMDirc.iml" filepath="$PROJECT_DIR$/DMDirc.iml" />
5 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/activewindow/activewindow.iml" filepath="$PROJECT_DIR$/modules/plugins/activewindow/activewindow.iml" />
6 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/audio/audio.iml" filepath="$PROJECT_DIR$/modules/plugins/audio/audio.iml" />
7 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/calc/calc.iml" filepath="$PROJECT_DIR$/modules/plugins/calc/calc.iml" />
8 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/conditional_execute/conditional_execute.iml" filepath="$PROJECT_DIR$/modules/plugins/conditional_execute/conditional_execute.iml" />
9 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/contactlist/contactlist.iml" filepath="$PROJECT_DIR$/modules/plugins/contactlist/contactlist.iml" />
10 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/dcc/dcc.iml" filepath="$PROJECT_DIR$/modules/plugins/dcc/dcc.iml" />
11 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/dcop/dcop.iml" filepath="$PROJECT_DIR$/modules/plugins/dcop/dcop.iml" />
12 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/debug/debug.iml" filepath="$PROJECT_DIR$/modules/plugins/debug/debug.iml" />
13 
+      <module fileurl="file://$PROJECT_DIR$/dmdirc.iml" filepath="$PROJECT_DIR$/dmdirc.iml" />
14 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/dns/dns.iml" filepath="$PROJECT_DIR$/modules/plugins/dns/dns.iml" />
15 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/exec/exec.iml" filepath="$PROJECT_DIR$/modules/plugins/exec/exec.iml" />
16 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/freedesktop_notifications/freedesktop_notifications.iml" filepath="$PROJECT_DIR$/modules/plugins/freedesktop_notifications/freedesktop_notifications.iml" />
17 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/identd/identd.iml" filepath="$PROJECT_DIR$/modules/plugins/identd/identd.iml" />
18 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/lagdisplay/lagdisplay.iml" filepath="$PROJECT_DIR$/modules/plugins/lagdisplay/lagdisplay.iml" />
19 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/logging/logging.iml" filepath="$PROJECT_DIR$/modules/plugins/logging/logging.iml" />
20 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/mediasource_dbus/mediasource_dbus.iml" filepath="$PROJECT_DIR$/modules/plugins/mediasource_dbus/mediasource_dbus.iml" />
21 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/mediasource_dcop/mediasource_dcop.iml" filepath="$PROJECT_DIR$/modules/plugins/mediasource_dcop/mediasource_dcop.iml" />
22 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/mediasource_linux_title/mediasource_linux_title.iml" filepath="$PROJECT_DIR$/modules/plugins/mediasource_linux_title/mediasource_linux_title.iml" />
23 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/mediasource_mplayer/mediasource_mplayer.iml" filepath="$PROJECT_DIR$/modules/plugins/mediasource_mplayer/mediasource_mplayer.iml" />
24 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/mediasource_vlc/mediasource_vlc.iml" filepath="$PROJECT_DIR$/modules/plugins/mediasource_vlc/mediasource_vlc.iml" />
25 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/mediasource_windows/mediasource_windows.iml" filepath="$PROJECT_DIR$/modules/plugins/mediasource_windows/mediasource_windows.iml" />
26 
+      <module fileurl="file://$PROJECT_DIR$/modules/modules.iml" filepath="$PROJECT_DIR$/modules/modules.iml" />
27 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/nickcolours/nickcolours.iml" filepath="$PROJECT_DIR$/modules/plugins/nickcolours/nickcolours.iml" />
28 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/nma/nma.iml" filepath="$PROJECT_DIR$/modules/plugins/nma/nma.iml" />
29 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/notifications/notifications.iml" filepath="$PROJECT_DIR$/modules/plugins/notifications/notifications.iml" />
30 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/nowplaying/nowplaying.iml" filepath="$PROJECT_DIR$/modules/plugins/nowplaying/nowplaying.iml" />
31 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/osd/osd.iml" filepath="$PROJECT_DIR$/modules/plugins/osd/osd.iml" />
32 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/osx_integration/osx_integration.iml" filepath="$PROJECT_DIR$/modules/plugins/osx_integration/osx_integration.iml" />
6 33 
       <module fileurl="file://$PROJECT_DIR$/.idea/parser.iml" filepath="$PROJECT_DIR$/.idea/parser.iml" />
34 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/parser_irc/parser_irc.iml" filepath="$PROJECT_DIR$/modules/plugins/parser_irc/parser_irc.iml" />
35 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/parser_xmpp/parser_xmpp.iml" filepath="$PROJECT_DIR$/modules/plugins/parser_xmpp/parser_xmpp.iml" />
36 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/parserdebug/parserdebug.iml" filepath="$PROJECT_DIR$/modules/plugins/parserdebug/parserdebug.iml" />
7 37 
       <module fileurl="file://$PROJECT_DIR$/.idea/plugins.iml" filepath="$PROJECT_DIR$/.idea/plugins.iml" />
38 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/redirect/redirect.iml" filepath="$PROJECT_DIR$/modules/plugins/redirect/redirect.iml" />
39 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/scriptplugin/scriptplugin.iml" filepath="$PROJECT_DIR$/modules/plugins/scriptplugin/scriptplugin.iml" />
40 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/serverlistdialog/serverlistdialog.iml" filepath="$PROJECT_DIR$/modules/plugins/serverlistdialog/serverlistdialog.iml" />
41 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/serverlists/serverlists.iml" filepath="$PROJECT_DIR$/modules/plugins/serverlists/serverlists.iml" />
42 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/sessionlock/sessionlock.iml" filepath="$PROJECT_DIR$/modules/plugins/sessionlock/sessionlock.iml" />
43 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/systray/systray.iml" filepath="$PROJECT_DIR$/modules/plugins/systray/systray.iml" />
44 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/tabcompletion_bash/tabcompletion_bash.iml" filepath="$PROJECT_DIR$/modules/plugins/tabcompletion_bash/tabcompletion_bash.iml" />
45 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/tabcompletion_mirc/tabcompletion_mirc.iml" filepath="$PROJECT_DIR$/modules/plugins/tabcompletion_mirc/tabcompletion_mirc.iml" />
46 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/time/time.iml" filepath="$PROJECT_DIR$/modules/plugins/time/time.iml" />
47 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/ui_swing/ui_swing.iml" filepath="$PROJECT_DIR$/modules/plugins/ui_swing/ui_swing.iml" />
8 48 
       <module fileurl="file://$PROJECT_DIR$/.idea/util.iml" filepath="$PROJECT_DIR$/.idea/util.iml" />
49 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/windowflashing/windowflashing.iml" filepath="$PROJECT_DIR$/modules/plugins/windowflashing/windowflashing.iml" />
50 
+      <module fileurl="file://$PROJECT_DIR$/modules/plugins/windowstatus/windowstatus.iml" filepath="$PROJECT_DIR$/modules/plugins/windowstatus/windowstatus.iml" />
9 51 
     </modules>
10 52 
   </component>
11 53 
 </project>

+ 7
- 4
.idea/parser.iml Zobrazit soubor 

@@ -1,22 +1,25 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 
-<module external.linked.project.path="$MODULE_DIR$/modules/parser" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="DMDirc.modules" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2 
+<module external.linked.project.id=":modules:parser" external.linked.project.path="$MODULE_DIR$/modules/parser" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.modules" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3 3 
   <component name="NewModuleRootManager" inherit-compiler-output="false">
4 4 
     <output url="file://$MODULE_DIR$/modules/parser/build/classes/main" />
5 5 
     <output-test url="file://$MODULE_DIR$/modules/parser/build/classes/test" />
6 6 
     <exclude-output />
7 7 
     <content url="file://$MODULE_DIR$/modules/parser">
8 8 
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/src" isTestSource="false" />
9 
+      <sourceFolder url="file://$MODULE_DIR$/modules/parser/src/main/java" isTestSource="false" />
10 
+      <sourceFolder url="file://$MODULE_DIR$/modules/parser/src/test/java" isTestSource="true" />
9 11 
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/test" isTestSource="true" />
10 12 
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/res" type="java-resource" />
13 
+      <sourceFolder url="file://$MODULE_DIR$/modules/parser/src/main/resources" type="java-resource" />
11 14 
       <sourceFolder url="file://$MODULE_DIR$/modules/parser/src/test/resources" type="java-test-resource" />
12 15 
       <excludeFolder url="file://$MODULE_DIR$/modules/parser/.gradle" />
13 16 
       <excludeFolder url="file://$MODULE_DIR$/modules/parser/build" />
14 17 
     </content>
15 18 
     <orderEntry type="inheritedJdk" />
16 19 
     <orderEntry type="sourceFolder" forTests="false" />
17 
-    <orderEntry type="library" scope="TEST" name="Gradle: junit-4.12-beta-1" level="project" />
18 
-    <orderEntry type="library" scope="TEST" name="Gradle: mockito-all-1.9.5" level="project" />
19 
-    <orderEntry type="library" scope="TEST" name="Gradle: hamcrest-core-1.3" level="project" />
20 
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12-beta-1" level="project" />
21 
+    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
22 
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
20 23 
   </component>
21 24 
 </module>
22 25

+ 1
- 102
.idea/plugins.iml Zobrazit soubor 

@@ -1,111 +1,10 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 
-<module type="JAVA_MODULE" version="4">
2 
+<module external.linked.project.id="plugins" external.linked.project.path="$MODULE_DIR$/modules/plugins" external.root.project.path="$MODULE_DIR$/modules/plugins" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3 3 
   <component name="NewModuleRootManager" inherit-compiler-output="true">
4 4 
     <exclude-output />
5 5 
     <content url="file://$MODULE_DIR$/modules/plugins">
6 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/activewindow/src" isTestSource="false" />
7 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/audio/src" isTestSource="false" />
8 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/calc/src" isTestSource="false" />
9 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/calc/test" isTestSource="true" />
10 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/conditional_execute/src" isTestSource="false" />
11 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/conditional_execute/test" isTestSource="true" />
12 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/contactlist/src" isTestSource="false" />
13 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dcc/src" isTestSource="false" />
14 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dcc/test" isTestSource="true" />
15 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dcop/src" isTestSource="false" />
16 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/debug/src" isTestSource="false" />
17 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/debug/test" isTestSource="true" />
18 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dns/src" isTestSource="false" />
19 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/exec/src" isTestSource="false" />
20 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/freedesktop_notifications/src" isTestSource="false" />
21 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/identd/src" isTestSource="false" />
22 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/identd/test" isTestSource="true" />
23 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/lagdisplay/src" isTestSource="false" />
24 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/logging/src" isTestSource="false" />
25 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_dbus/src" isTestSource="false" />
26 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_dcop/src" isTestSource="false" />
27 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_linux_title/src" isTestSource="false" />
28 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_mplayer/src" isTestSource="false" />
29 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_vlc/src" isTestSource="false" />
30 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_vlc/test" isTestSource="true" />
31 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_windows/src" isTestSource="false" />
32 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/nickcolours/src" isTestSource="false" />
33 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/nma/src" isTestSource="false" />
34 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/notifications/src" isTestSource="false" />
35 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/nowplaying/src" isTestSource="false" />
36 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/osd/src" isTestSource="false" />
37 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/osd/test" isTestSource="true" />
38 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/osx_integration/src" isTestSource="false" />
39 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/parser_irc/src" isTestSource="false" />
40 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/parser_xmpp/src" isTestSource="false" />
41 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/parserdebug/src" isTestSource="false" />
42 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/redirect/src" isTestSource="false" />
43 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/redirect/test" isTestSource="true" />
44 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/scriptplugin/src" isTestSource="false" />
45 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/serverlistdialog/src" isTestSource="false" />
46 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/serverlists/src" isTestSource="false" />
47 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/sessionlock/src" isTestSource="false" />
48 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/systray/src" isTestSource="false" />
49 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/tabcompletion_bash/src" isTestSource="false" />
50 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/tabcompletion_mirc/src" isTestSource="false" />
51 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/time/src" isTestSource="false" />
52 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/ui_swing/src" isTestSource="false" />
53 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/ui_swing/test" isTestSource="true" />
54 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/windowflashing/src" isTestSource="false" />
55 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/windowstatus/src" isTestSource="false" />
56 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/contactlist/res" type="java-resource" />
57 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dcc/res" type="java-resource" />
58 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/freedesktop_notifications/res" type="java-resource" />
59 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_vlc/res" type="java-resource" />
60 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_windows/res" type="java-resource" />
61 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/nowplaying/res" type="java-resource" />
62 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/osd/res" type="java-resource" />
63 
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/ui_swing/res" type="java-resource" />
64 6 
       <excludeFolder url="file://$MODULE_DIR$/modules/plugins/.gradle" />
65 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/activewindow/build" />
66 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/audio/build" />
67 7 
       <excludeFolder url="file://$MODULE_DIR$/modules/plugins/build" />
68 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/calc/build" />
69 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/conditional_execute/build" />
70 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/dcc/build" />
71 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/dcop/build" />
72 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/debug/build" />
73 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/dist" />
74 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/dns/build" />
75 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/etc" />
76 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/exec/build" />
77 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/freedesktop_notifications/build" />
78 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/identd/build" />
79 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/lagdisplay/build" />
80 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/lib" />
81 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/logging/build" />
82 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_dbus/build" />
83 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_dcop/build" />
84 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_linux_title/build" />
85 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_mplayer/build" />
86 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_vlc/build" />
87 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_windows/build" />
88 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/nickcolours/build" />
89 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/nma/build" />
90 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/notifications/build" />
91 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/nowplaying/build" />
92 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/osd/build" />
93 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/osx_integration/build" />
94 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/parser_irc/build" />
95 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/parser_xmpp/build" />
96 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/parserdebug/build" />
97 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/redirect/build" />
98 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/scriptplugin/build" />
99 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/serverlistdialog/build" />
100 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/serverlists/build" />
101 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/sessionlock/build" />
102 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/systray/build" />
103 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/tabcompletion_bash/build" />
104 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/tabcompletion_mirc/build" />
105 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/time/build" />
106 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/ui_swing/build" />
107 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/windowflashing/build" />
108 
-      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/windowstatus/build" />
109 8 
     </content>
110 9 
     <orderEntry type="inheritedJdk" />
111 10 
     <orderEntry type="sourceFolder" forTests="false" />

+ 1
- 0
.idea/runConfigurations/All_tests.xml Zobrazit soubor 

@@ -1,5 +1,6 @@
1 1 
 <component name="ProjectRunConfigurationManager">
2 2 
   <configuration default="false" name="All tests" type="JUnit" factoryName="JUnit">
3 
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
3 4 
     <module name="" />
4 5 
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
5 6 
     <option name="ALTERNATIVE_JRE_PATH" value="" />

+ 1
- 0
.idea/runConfigurations/DMDirc.xml Zobrazit soubor 

@@ -1,5 +1,6 @@
1 1 
 <component name="ProjectRunConfigurationManager">
2 2 
   <configuration default="false" name="DMDirc" type="Application" factoryName="Application">
3 
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
3 4 
     <option name="MAIN_CLASS_NAME" value="com.dmdirc.Main" />
4 5 
     <option name="VM_PARAMETERS" value="" />
5 6 
     <option name="PROGRAM_PARAMETERS" value="" />

+ 8
- 4
.idea/util.iml Zobrazit soubor 

@@ -1,22 +1,26 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 
-<module external.linked.project.path="$MODULE_DIR$/modules/util" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.dmdirc" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2 
+<module external.linked.project.id=":modules:util" external.linked.project.path="$MODULE_DIR$/modules/util" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.dmdirc" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3 3 
   <component name="NewModuleRootManager" inherit-compiler-output="false">
4 4 
     <output url="file://$MODULE_DIR$/modules/util/build/classes/main" />
5 5 
     <output-test url="file://$MODULE_DIR$/modules/util/build/classes/test" />
6 6 
     <exclude-output />
7 7 
     <content url="file://$MODULE_DIR$/modules/util">
8 8 
       <sourceFolder url="file://$MODULE_DIR$/modules/util/src" isTestSource="false" />
9 
+      <sourceFolder url="file://$MODULE_DIR$/modules/util/src/main/java" isTestSource="false" />
10 
+      <sourceFolder url="file://$MODULE_DIR$/modules/util/src/test/java" isTestSource="true" />
9 11 
       <sourceFolder url="file://$MODULE_DIR$/modules/util/test" isTestSource="true" />
10 12 
       <sourceFolder url="file://$MODULE_DIR$/modules/util/res" type="java-resource" />
13 
+      <sourceFolder url="file://$MODULE_DIR$/modules/util/src/main/resources" type="java-resource" />
14 
+      <sourceFolder url="file://$MODULE_DIR$/modules/util/src/test/resources" type="java-test-resource" />
11 15 
       <sourceFolder url="file://$MODULE_DIR$/modules/util/test-res" type="java-test-resource" />
12 16 
       <excludeFolder url="file://$MODULE_DIR$/modules/util/.gradle" />
13 17 
       <excludeFolder url="file://$MODULE_DIR$/modules/util/build" />
14 18 
     </content>
15 19 
     <orderEntry type="inheritedJdk" />
16 20 
     <orderEntry type="sourceFolder" forTests="false" />
17 
-    <orderEntry type="library" scope="TEST" name="Gradle: junit-4.12-beta-1" level="project" />
18 
-    <orderEntry type="library" scope="TEST" name="Gradle: mockito-all-1.9.5" level="project" />
19 
-    <orderEntry type="library" scope="TEST" name="Gradle: hamcrest-core-1.3" level="project" />
21 
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12-beta-1" level="project" />
22 
+    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
23 
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
20 24 
   </component>
21 25 
 </module>
22 26

+ 12
- 0
.idea/vcs.xml Zobrazit soubor 

@@ -5,10 +5,16 @@
5 5 
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
6 6 
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
7 7 
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
8 
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
9 
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
10 
+    <mapping directory="$PROJECT_DIR$/modules/defaults" vcs="Git" />
8 11 
     <mapping directory="$PROJECT_DIR$/modules/defaults" vcs="Git" />
9 12 
     <mapping directory="$PROJECT_DIR$/modules/defaults" vcs="Git" />
10 13 
     <mapping directory="$PROJECT_DIR$/modules/defaults" vcs="Git" />
11 14 
     <mapping directory="$PROJECT_DIR$/modules/defaults" vcs="Git" />
15 
+    <mapping directory="$PROJECT_DIR$/modules/defaults" vcs="Git" />
16 
+    <mapping directory="$PROJECT_DIR$/modules/installer" vcs="Git" />
17 
+    <mapping directory="$PROJECT_DIR$/modules/installer" vcs="Git" />
12 18 
     <mapping directory="$PROJECT_DIR$/modules/installer" vcs="Git" />
13 19 
     <mapping directory="$PROJECT_DIR$/modules/installer" vcs="Git" />
14 20 
     <mapping directory="$PROJECT_DIR$/modules/installer" vcs="Git" />
 
@@ -17,10 +23,16 @@
17 23 
     <mapping directory="$PROJECT_DIR$/modules/parser" vcs="Git" />
18 24 
     <mapping directory="$PROJECT_DIR$/modules/parser" vcs="Git" />
19 25 
     <mapping directory="$PROJECT_DIR$/modules/parser" vcs="Git" />
26 
+    <mapping directory="$PROJECT_DIR$/modules/parser" vcs="Git" />
27 
+    <mapping directory="$PROJECT_DIR$/modules/parser" vcs="Git" />
28 
+    <mapping directory="$PROJECT_DIR$/modules/plugins" vcs="Git" />
20 29 
     <mapping directory="$PROJECT_DIR$/modules/plugins" vcs="Git" />
21 30 
     <mapping directory="$PROJECT_DIR$/modules/plugins" vcs="Git" />
22 31 
     <mapping directory="$PROJECT_DIR$/modules/plugins" vcs="Git" />
23 32 
     <mapping directory="$PROJECT_DIR$/modules/plugins" vcs="Git" />
33 
+    <mapping directory="$PROJECT_DIR$/modules/plugins" vcs="Git" />
34 
+    <mapping directory="$PROJECT_DIR$/modules/util" vcs="Git" />
35 
+    <mapping directory="$PROJECT_DIR$/modules/util" vcs="Git" />
24 36 
     <mapping directory="$PROJECT_DIR$/modules/util" vcs="Git" />
25 37 
     <mapping directory="$PROJECT_DIR$/modules/util" vcs="Git" />
26 38 
     <mapping directory="$PROJECT_DIR$/modules/util" vcs="Git" />

+ 20
- 18
DMDirc.iml Zobrazit soubor 

@@ -1,37 +1,39 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2 
+<module external.linked.project.id="dmdirc" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3 3 
   <component name="NewModuleRootManager" inherit-compiler-output="false">
4 4 
     <output url="file://$MODULE_DIR$/build/classes/main" />
5 5 
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
6 6 
     <exclude-output />
7 7 
     <content url="file://$MODULE_DIR$">
8 8 
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
9 
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
10 
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
9 11 
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
10 12 
       <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
13 
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
11 14 
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
12 15 
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
13 16 
       <excludeFolder url="file://$MODULE_DIR$/build" />
14 
-      <excludeFolder url="file://$MODULE_DIR$/modules" />
15 17 
     </content>
16 18 
     <orderEntry type="inheritedJdk" />
17 19 
     <orderEntry type="sourceFolder" forTests="false" />
18 
-    <orderEntry type="module" module-name="parser" exported="" />
20 
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
19 21 
     <orderEntry type="module" module-name="util" exported="" />
20 
-    <orderEntry type="library" exported="" name="Gradle: dagger-1.2.1" level="project" />
21 
-    <orderEntry type="library" exported="" name="Gradle: yamlbeans-1.08" level="project" />
22 
-    <orderEntry type="library" exported="" name="Gradle: migbase64-2.2" level="project" />
23 
-    <orderEntry type="library" exported="" name="Gradle: raven-4.2.1" level="project" />
24 
-    <orderEntry type="library" exported="" name="Gradle: guava-17.0" level="project" />
25 
-    <orderEntry type="library" exported="" name="Gradle: mbassador-1.1.10" level="project" />
26 
-    <orderEntry type="library" exported="" name="Gradle: jsr305-2.0.3" level="project" />
27 
-    <orderEntry type="library" exported="" name="Gradle: dagger-compiler-1.2.1" level="project" />
28 
-    <orderEntry type="library" exported="" name="Gradle: javax.inject-1" level="project" />
29 
-    <orderEntry type="library" exported="" name="Gradle: slf4j-api-1.7.7" level="project" />
30 
-    <orderEntry type="library" exported="" name="Gradle: jackson-core-2.4.2" level="project" />
31 
-    <orderEntry type="library" exported="" name="Gradle: javawriter-2.3.0" level="project" />
32 
-    <orderEntry type="library" scope="TEST" name="Gradle: junit-4.12-beta-1" level="project" />
33 
-    <orderEntry type="library" scope="TEST" name="Gradle: mockito-all-1.9.5" level="project" />
34 
-    <orderEntry type="library" scope="TEST" name="Gradle: hamcrest-core-1.3" level="project" />
22 
+    <orderEntry type="module" module-name="parser" exported="" />
23 
+    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
24 
+    <orderEntry type="library" exported="" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
25 
+    <orderEntry type="library" exported="" name="Gradle: com.brsanthu:migbase64:2.2" level="project" />
26 
+    <orderEntry type="library" exported="" name="Gradle: net.kencochrane.raven:raven:4.2.1" level="project" />
27 
+    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:17.0" level="project" />
28 
+    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.1.10" level="project" />
29 
+    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:2.0.3" level="project" />
30 
+    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
31 
+    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
32 
+    <orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.7" level="project" />
33 
+    <orderEntry type="library" exported="" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.4.2" level="project" />
34 
+    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
35 
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12-beta-1" level="project" />
36 
+    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
35 37 
   </component>
36 38 
 </module>
37 39

+ 25
- 0
modules/modules.iml Zobrazit soubor 

@@ -0,0 +1,25 @@
1 
+<?xml version="1.0" encoding="UTF-8"?>
2 
+<module external.linked.project.id=":modules" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="dmdirc" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3 
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
4 
+    <output url="file://$MODULE_DIR$/build/classes/main" />
5 
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
6 
+    <exclude-output />
7 
+    <content url="file://$MODULE_DIR$">
8 
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
9 
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
10 
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
11 
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
12 
+      <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
13 
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
14 
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
15 
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
16 
+      <excludeFolder url="file://$MODULE_DIR$/build" />
17 
+    </content>
18 
+    <orderEntry type="inheritedJdk" />
19 
+    <orderEntry type="sourceFolder" forTests="false" />
20 
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12-beta-1" level="project" />
21 
+    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
22 
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
23 
+  </component>
24 
+</module>
25 
+

Zapsat Náhled
Načítá se…
Zrušit
Uložit