[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19744 - in gnunet-java: . .idea src/org/gnunet/util tools
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r19744 - in gnunet-java: . .idea src/org/gnunet/util tools |
|
Date: |
Thu, 9 Feb 2012 14:31:23 +0100 |
Author: dold
Date: 2012-02-09 14:31:23 +0100 (Thu, 09 Feb 2012)
New Revision: 19744
Added:
gnunet-java/tools/
gnunet-java/tools/build
gnunet-java/tools/coverage
gnunet-java/tools/run-tests
gnunet-java/tools/update-msgtypes
Modified:
gnunet-java/.idea/workspace.xml
gnunet-java/src/org/gnunet/util/Client.java
Log:
added tools directory
Modified: gnunet-java/.idea/workspace.xml
===================================================================
--- gnunet-java/.idea/workspace.xml 2012-02-09 13:30:43 UTC (rev 19743)
+++ gnunet-java/.idea/workspace.xml 2012-02-09 13:31:23 UTC (rev 19744)
@@ -1,29 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" readonly="true"
id="b4faf44d-8919-474e-bfab-5900bc40cc2b" name="Default" comment="">
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/nse" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/statistics" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/libraries/commons_io_2_1.xml" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/nse/NetworkSizeEstimation.java" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/statistics/StatisticsService.java" />
- <change type="DELETED"
beforePath="$PROJECT_DIR$/test/org/gnunet/services/StatisticsServiceTest.java"
afterPath="" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml"
afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" />
+ <list readonly="true" id="b4faf44d-8919-474e-bfab-5900bc40cc2b"
name="Default" comment="" />
+ <list default="true" id="98f1d034-aef8-46c1-8b7a-dd150665aa24" name="New
changelist" comment="">
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/tools" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/tools/build" />
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/tools/coverage" />
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/tools/run-tests" />
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/tools/update-msgtypes" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/.idea/workspace.xml"
afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ISSUES"
afterPath="$PROJECT_DIR$/ISSUES" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/log4j.properties"
afterPath="$PROJECT_DIR$/src/log4j.properties" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/Construct.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/Construct.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/MsgMap.txt"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/MsgMap.txt" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTime.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTime.java" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/Client.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Client.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/Configuration.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Configuration.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/Program.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Program.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/RelativeTime.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/RelativeTime.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/Resolver.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Resolver.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/getopt/Parser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/getopt/Parser.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/test/org/gnunet/construct/ConstructTest.java"
afterPath="$PROJECT_DIR$/test/org/gnunet/construct/ConstructTest.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/test/org/gnunet/services/ConfigUtil.java"
afterPath="$PROJECT_DIR$/test/org/gnunet/services/ConfigUtil.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java"
afterPath="$PROJECT_DIR$/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java"
/>
</list>
<ignored path="gnunet-java.iws" />
<ignored path=".idea/workspace.xml" />
@@ -94,32 +80,20 @@
<entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/Configuration.java">
<provider selected="true" editor-type-id="text-editor">
<state line="53" column="51" selection-start="1656"
selection-end="1656" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="e#1345#1372#0" expanded="true" />
- <element signature="e#10585#10591#0" expanded="true" />
- </folding>
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Client.java" pinned="false" current="false"
current-in-tab="false">
+ <file leaf-file-name="Client.java" pinned="false" current="true"
current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Client.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="434" column="38" selection-start="15676"
selection-end="15676" vertical-scroll-proportion="0.0">
+ <state line="300" column="0" selection-start="10244"
selection-end="10244" vertical-scroll-proportion="0.6054131">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ISSUES" pinned="false" current="true"
current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/ISSUES">
- <provider selected="true" editor-type-id="text-editor">
- <state line="209" column="0" selection-start="7413"
selection-end="7413" vertical-scroll-proportion="1.3073497">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
<file leaf-file-name="log4j.properties" pinned="false" current="false"
current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/log4j.properties">
<provider selected="true" editor-type-id="text-editor">
@@ -142,9 +116,7 @@
<entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Resolver.java">
<provider selected="true" editor-type-id="text-editor">
<state line="334" column="20" selection-start="10112"
selection-end="10112" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="e#617#673#0" expanded="true" />
- </folding>
+ <folding />
</state>
</provider>
</entry>
@@ -170,12 +142,21 @@
<file leaf-file-name="Program.java" pinned="false" current="false"
current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Program.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="110" column="15" selection-start="3615"
selection-end="3615" vertical-scroll-proportion="0.0">
+ <state line="121" column="26" selection-start="3886"
selection-end="3886" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="RelativeTime.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/RelativeTime.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="30" column="19" selection-start="1030"
selection-end="1030" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -200,8 +181,8 @@
<option value="$PROJECT_DIR$/src/org/gnunet/util/Program.java" />
<option value="$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTime.java" />
<option value="$PROJECT_DIR$/src/org/gnunet/util/Resolver.java" />
- <option value="$PROJECT_DIR$/src/org/gnunet/util/Client.java" />
<option value="$PROJECT_DIR$/ISSUES" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/util/Client.java" />
</list>
</option>
</component>
@@ -343,7 +324,7 @@
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="2" id="Add" />
- <ConfirmationsSetting value="0" id="Remove" />
+ <ConfirmationsSetting value="2" id="Remove" />
</component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
@@ -441,6 +422,34 @@
</PATH>
</subPane>
</pane>
+ <pane id="PackagesPane">
+ <subPane>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gnunet-java" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gnunet-java" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gnunet-java" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gnunet-java" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </pane>
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -596,14 +605,6 @@
<option name="myItemId" value="gnunet" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="util" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="getopt" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -615,62 +616,12 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gnunet" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="gnunet-java" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gnunet-java" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="lib" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
- <pane id="PackagesPane">
- <subPane>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="gnunet-java" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gnunet-java" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="gnunet-java" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gnunet-java" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
- </pane>
</panes>
</component>
<component name="PropertiesComponent">
@@ -983,12 +934,12 @@
<editor active="false" />
<layout>
<window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.24313186" sideWeight="0.49713057" order="7" side_tool="false"
content_ui="tabs" />
- <window_info id="Changes" active="true" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.32967034" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
+ <window_info id="Changes" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32967034" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32967034"
sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.24098124" sideWeight="0.6710875" order="1" side_tool="false"
content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.23015873" sideWeight="0.58928573" order="1" side_tool="false"
content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24891774"
sideWeight="0.6703297" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25613275"
sideWeight="0.8543956" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44230768"
sideWeight="0.63708514" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.45054945" sideWeight="0.35786435" order="7" side_tool="true"
content_ui="tabs" />
@@ -1037,7 +988,7 @@
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
<option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="fixed various issues with
command line parsing, rewrote configuration parser, fixed resolver" />
+ <option name="LAST_COMMIT_MESSAGE" value="added commons io jar" />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -1056,10 +1007,11 @@
<MESSAGE value="added libs" />
<MESSAGE value="rudimentary version of resolve tool completed" />
<MESSAGE value="implemented message unions, parameter parsing" />
- <MESSAGE value="fix" />
<MESSAGE value="message unions now used in resolver" />
<MESSAGE value="fixed parameter parsing bug" />
<MESSAGE value="fixed various issues with command line parsing, rewrote
configuration parser, fixed resolver" />
+ <MESSAGE value="fix" />
+ <MESSAGE value="added commons io jar" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -1069,11 +1021,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry
file="file://$PROJECT_DIR$/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="55" column="0" selection-start="1528"
selection-end="1528" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Scheduler.java">
<provider selected="true" editor-type-id="text-editor">
<state line="269" column="33" selection-start="8696"
selection-end="8696" vertical-scroll-proportion="0.0" />
@@ -1099,73 +1046,59 @@
<state line="222" column="10" selection-start="7093"
selection-end="7093" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/log4j.properties">
+ <entry file="file://$PROJECT_DIR$/ISSUES">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="0" selection-start="194" selection-end="194"
vertical-scroll-proportion="0.0" />
+ <state line="185" column="0" selection-start="6396"
selection-end="6396" vertical-scroll-proportion="0.30017152" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/test/org/gnunet/construct/UnionTest.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="5" column="24" selection-start="80" selection-end="80"
vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/org/gnunet/util/getopt/Parser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="24" column="7" selection-start="632" selection-end="632"
vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="24" column="7" selection-start="632" selection-end="632"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Configuration.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="53" column="51" selection-start="1656"
selection-end="1656" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="e#1345#1372#0" expanded="true" />
- <element signature="e#10585#10591#0" expanded="true" />
- </folding>
- </state>
+ <state line="53" column="51" selection-start="1656"
selection-end="1656" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Program.java">
+ <entry file="file://$PROJECT_DIR$/src/log4j.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="110" column="15" selection-start="3615"
selection-end="3615" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="6" column="0" selection-start="194" selection-end="194"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTime.java">
+ <entry
file="file://$PROJECT_DIR$/test/org/gnunet/construct/UnionTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="137" column="0" selection-start="4148"
selection-end="4456" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="5" column="24" selection-start="80" selection-end="80"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Resolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="334" column="20" selection-start="10112"
selection-end="10112" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="e#617#673#0" expanded="true" />
- </folding>
- </state>
+ <state line="334" column="20" selection-start="10112"
selection-end="10112" vertical-scroll-proportion="0.0" />
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/test/org/gnunet/construct/StringMessage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="2" column="13" selection-start="44" selection-end="44"
vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="2" column="13" selection-start="44" selection-end="44"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Client.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/AbsoluteTime.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="434" column="38" selection-start="15676"
selection-end="15676" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="137" column="0" selection-start="4148"
selection-end="4456" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/ISSUES">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Program.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="209" column="0" selection-start="7413"
selection-end="7413" vertical-scroll-proportion="1.3073497">
+ <state line="121" column="26" selection-start="3886"
selection-end="3886" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/RelativeTime.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="30" column="19" selection-start="1030"
selection-end="1030" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Client.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="300" column="0" selection-start="10244"
selection-end="10244" vertical-scroll-proportion="0.6054131">
<folding />
</state>
</provider>
Modified: gnunet-java/src/org/gnunet/util/Client.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Client.java 2012-02-09 13:30:43 UTC (rev
19743)
+++ gnunet-java/src/org/gnunet/util/Client.java 2012-02-09 13:31:23 UTC (rev
19744)
@@ -288,7 +288,8 @@
@Override
public void onFinished() {
this.resolveActive = false;
- Scheduler.add(this, backoff);
+ connectStep();
+ //Scheduler.add(this, backoff);
}
@Override
Added: gnunet-java/tools/build
===================================================================
--- gnunet-java/tools/build (rev 0)
+++ gnunet-java/tools/build 2012-02-09 13:31:23 UTC (rev 19744)
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+SOURCES=$( mktemp "/tmp/gnunet-java-sources-XXX" )
+
+# collect all source files
+find "$BASEDIR/src/" "$BASEDIR/test/" -name "*.java" > $SOURCES
+
+mkdir -p $BASEDIR/bin/
+
+javac -g -cp "$BASEDIR/bin/:$BASEDIR/lib/*" -d $BASEDIR/bin/ @$SOURCES
+
+rm $SOURCES
+
+
+cd "$BASEDIR/src/"
+
+# collect resources from src/ and copy to bin/
+find "." \( -name "*.txt" -o -name "*.properties" \) \
+ -exec cp --parents '{}' "../bin" \;
+
Property changes on: gnunet-java/tools/build
___________________________________________________________________
Added: svn:executable
+ *
Added: gnunet-java/tools/coverage
===================================================================
--- gnunet-java/tools/coverage (rev 0)
+++ gnunet-java/tools/coverage 2012-02-09 13:31:23 UTC (rev 19744)
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+
+INSTRUMENT_CMD="sh $BASEDIR/cobertura/cobertura-instrument.sh --datafile
$BASEDIR/coverage.data --destination $BASEDIR/bin-instrumented"
+
+case "$1" in
+instrument)
+ cp -r "$BASEDIR/bin/" "$BASEDIR/bin-instrumented/"
+ find $BASEDIR/bin/ -name *.class | xargs $INSTRUMENT_CMD
+ ;;
+clean)
+ rm -r $BASEDIR/bin-instrumented &>/dev/null
+ rm $BASEDIR/coverage.data &>/dev/null
+ rm -r $BASEDIR/coverage-report &>/dev/null
+ ;;
+report)
+ sh $BASEDIR/cobertura/cobertura-report.sh --destination
$BASEDIR/coverage-report --datafile $BASEDIR/coverage.data $BASEDIR/src/
$BASEDIR/test/
+ ;;
+run)
+ cd "$BASEDIR/test"
+
+ TESTS=$( find . -name "*Test.java" | sed -e 's/\.java//' -e 's/..//' -e
's/\//\./g' )
+
+ echo Testing classes: $TESTS
+
+ # the version without coverage:
+ #java -cp "$BASEDIR/bin:$BASEDIR/lib/*" org.junit.runner.JUnitCore $TESTS
+
+ COBERTURA="$BASEDIR/cobertura/cobertura.jar"
+
+
+ java -cp "$COBERTURA:$BASEDIR/bin-instrumented:$BASEDIR/lib/*"
-Dnet.sourceforge.cobertura.datafile="$BASEDIR/coverage.data"
org.junit.runner.JUnitCore $TESTS
+ ;;
+*)
+ echo "Usage: $0 {instrument|clean|report|run}"
+ exit 1
+esac
Property changes on: gnunet-java/tools/coverage
___________________________________________________________________
Added: svn:executable
+ *
Added: gnunet-java/tools/run-tests
===================================================================
--- gnunet-java/tools/run-tests (rev 0)
+++ gnunet-java/tools/run-tests 2012-02-09 13:31:23 UTC (rev 19744)
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+
+cd "$BASEDIR/test"
+
+TESTS=$( find . -name "*Test.java" | sed -e 's/\.java//' -e 's/..//' -e
's/\//\./g' )
+
+echo Testing classes: $TESTS
+
+# the version without coverage:
+java -cp "$BASEDIR/bin:$BASEDIR/lib/*" org.junit.runner.JUnitCore $TESTS
+
+COBERTURA="$BASEDIR/cobertura/cobertura.jar"
+
+
+#java -cp "$COBERTURA:$BASEDIR/bin-instrumented:$BASEDIR/lib/*"
org.junit.runner.JUnitCore $TESTS
+
+
Property changes on: gnunet-java/tools/run-tests
___________________________________________________________________
Added: svn:executable
+ *
Added: gnunet-java/tools/update-msgtypes
===================================================================
--- gnunet-java/tools/update-msgtypes (rev 0)
+++ gnunet-java/tools/update-msgtypes 2012-02-09 13:31:23 UTC (rev 19744)
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+SOURCES=$( mktemp "/tmp/gnunet-java-sources-XXX" )
+
+# collect all source files
+find $BASEDIR/src/ $BASEDIR/test/ -name "*.java" > $SOURCES
+
+# run annotation processor
+javac -cp "$BASEDIR/bin/:$BASEDIR/lib/*" -processor
org.gnunet.construct.MessageIdAnnotationProcessor -proc:only -s src @$SOURCES
+
+if [ $? ] ; then
+ rm $SOURCES
+else
+ exit 1
+fi
Property changes on: gnunet-java/tools/update-msgtypes
___________________________________________________________________
Added: svn:executable
+ *
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19744 - in gnunet-java: . .idea src/org/gnunet/util tools,
gnunet <=