[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21068 - in gnunet-java: .idea .idea/inspectionProfiles src
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r21068 - in gnunet-java: .idea .idea/inspectionProfiles src/org/gnunet/construct src/org/gnunet/construct/parsers src/org/gnunet/core src/org/gnunet/dht src/org/gnunet/nse src/org/gnunet/statistics src/org/gnunet/util src/org/grothoff test/org/gnunet tools |
|
Date: |
Sun, 22 Apr 2012 17:51:22 +0200 |
Author: dold
Date: 2012-04-22 17:51:22 +0200 (Sun, 22 Apr 2012)
New Revision: 21068
Added:
gnunet-java/src/org/gnunet/core/package-info.java
gnunet-java/src/org/gnunet/dht/package-info.java
gnunet-java/src/org/gnunet/nse/package-info.java
gnunet-java/src/org/gnunet/statistics/package-info.java
gnunet-java/src/org/grothoff/package-info.java
Removed:
gnunet-java/test/org/gnunet/services/
Modified:
gnunet-java/.idea/inspectionProfiles/Project_Default.xml
gnunet-java/.idea/workspace.xml
gnunet-java/src/org/gnunet/construct/Construct.java
gnunet-java/src/org/gnunet/construct/MessageIdAnnotationProcessor.java
gnunet-java/src/org/gnunet/construct/parsers/Parser.java
gnunet-java/src/org/gnunet/core/Core.java
gnunet-java/src/org/gnunet/dht/DistributedHashTable.java
gnunet-java/src/org/gnunet/statistics/Statistics.java
gnunet-java/src/org/gnunet/util/AbsoluteTime.java
gnunet-java/src/org/gnunet/util/Client.java
gnunet-java/src/org/gnunet/util/Configuration.java
gnunet-java/src/org/gnunet/util/Connection.java
gnunet-java/src/org/gnunet/util/HashCode.java
gnunet-java/src/org/gnunet/util/Program.java
gnunet-java/src/org/gnunet/util/Resolver.java
gnunet-java/src/org/gnunet/util/Scheduler.java
gnunet-java/src/org/gnunet/util/Server.java
gnunet-java/src/org/grothoff/Runabout.java
gnunet-java/tools/build
Log:
added documentation
Modified: gnunet-java/.idea/inspectionProfiles/Project_Default.xml
===================================================================
--- gnunet-java/.idea/inspectionProfiles/Project_Default.xml 2012-04-22
14:16:25 UTC (rev 21067)
+++ gnunet-java/.idea/inspectionProfiles/Project_Default.xml 2012-04-22
15:51:22 UTC (rev 21068)
@@ -138,7 +138,6 @@
<option name="insideTryAllowed" value="false" />
</inspection_tool>
<inspection_tool class="IfStatementWithIdenticalBranches" enabled="true"
level="WARNING" enabled_by_default="true" />
- <inspection_tool class="IncrementDecrementUsedAsExpression" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="InnerClassMayBeStatic" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="InnerClassVariableHidesOuterClassVariable"
enabled="true" level="WARNING" enabled_by_default="true">
<option name="m_ignoreInvisibleFields" value="true" />
Modified: gnunet-java/.idea/workspace.xml
===================================================================
--- gnunet-java/.idea/workspace.xml 2012-04-22 14:16:25 UTC (rev 21067)
+++ gnunet-java/.idea/workspace.xml 2012-04-22 15:51:22 UTC (rev 21068)
@@ -4,21 +4,36 @@
<option name="ANALYZE_TEST_SOURCES" value="false" />
</component>
<component name="ChangeListManager">
- <list default="true" readonly="true"
id="92cdd5e3-f1ea-4d90-81fc-cf0bd20d2d2e" name="Default" comment="more parts of
Core implemented, still major problems">
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/.idea/libraries/commons_io_2_2.xml" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Connection.java" />
+ <list default="true" readonly="true"
id="92cdd5e3-f1ea-4d90-81fc-cf0bd20d2d2e" name="Default" comment="">
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/core/package-info.java" />
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/dht/package-info.java" />
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/nse/package-info.java" />
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/statistics/package-info.java" />
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/grothoff/package-info.java" />
+ <change type="DELETED"
beforePath="$PROJECT_DIR$/test/org/gnunet/services/ConfigUtil.java"
afterPath="" />
+ <change type="DELETED"
beforePath="$PROJECT_DIR$/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java"
afterPath="" />
+ <change type="DELETED"
beforePath="$PROJECT_DIR$/test/org/gnunet/services/nse.conf" afterPath="" />
+ <change type="DELETED"
beforePath="$PROJECT_DIR$/test/org/gnunet/services/statistics.conf"
afterPath="" />
+ <change type="DELETED"
beforePath="$PROJECT_DIR$/test/org/gnunet/services" afterPath="" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml"
afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" />
<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/org/gnunet/construct/Construct.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/Construct.java" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/MessageIdAnnotationProcessor.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/MessageIdAnnotationProcessor.java"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/Parser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/Parser.java" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/core/Core.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/core/Core.java" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/dht/DistributedHashTable.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/dht/DistributedHashTable.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/nse/NetworkSizeEstimation.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/nse/NetworkSizeEstimation.java" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/statistics/Statistics.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/statistics/Statistics.java" />
+ <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/MessageTransmitter.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/MessageTransmitter.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/Connection.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Connection.java" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/HashCode.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/HashCode.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/Resolver.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Resolver.java" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/Scheduler.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Scheduler.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/Strings.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Strings.java" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/Server.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Server.java" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/grothoff/Runabout.java"
afterPath="$PROJECT_DIR$/src/org/grothoff/Runabout.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tools/build"
afterPath="$PROJECT_DIR$/tools/build" />
</list>
<ignored path="gnunet-java.iws" />
<ignored path=".idea/workspace.xml" />
@@ -76,106 +91,93 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="Client.java" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Client.java">
+ <file leaf-file-name="package-info.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/core/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="135" column="36" selection-start="5315"
selection-end="5315" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="e#0#6780#0" expanded="true" />
- <element signature="e#4898#5537#0" expanded="true" />
- <element signature="e#5522#5523#0" expanded="true" />
- <marker date="1334958405000" expanded="true"
signature="6496:6581" placeholder="/**...*/" />
- <marker date="1334958405000" expanded="true"
signature="6619:6659" placeholder="{...}" />
- </folding>
+ <state line="3" column="23" selection-start="67"
selection-end="67" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="GnunetMessage.java" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/GnunetMessage.java">
+ <file leaf-file-name="package-info.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/dht/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="19" selection-start="78"
selection-end="78" vertical-scroll-proportion="0.0">
+ <state line="1" column="25" selection-start="29"
selection-end="29" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Connection.java" pinned="false" current="true"
current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Connection.java">
+ <file leaf-file-name="package-info.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/statistics/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="412" column="0" selection-start="14820"
selection-end="14820" vertical-scroll-proportion="0.3086771">
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#12652#13034#0" expanded="true" />
- <element signature="e#13019#13020#0" expanded="true" />
- <element signature="e#17483#17621#0" expanded="true" />
- <element signature="e#17610#17611#0" expanded="true" />
- </folding>
+ <state line="1" column="33" selection-start="37"
selection-end="37" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Server.java" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Server.java">
+ <file leaf-file-name="package-info.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="0" selection-start="593"
selection-end="593" vertical-scroll-proportion="0.0">
+ <state line="1" column="41" selection-start="45"
selection-end="45" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="Runabout.java" pinned="false" current="false"
current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/org/grothoff/Runabout.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="22" selection-start="282"
selection-end="282" vertical-scroll-proportion="0.0">
+ <state line="40" column="38" selection-start="1934"
selection-end="1934" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Resolver.java" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Resolver.java">
+ <file leaf-file-name="package-info.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/getopt/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="217" column="13" selection-start="6126"
selection-end="6126" vertical-scroll-proportion="0.0">
+ <state line="1" column="30" selection-start="34"
selection-end="34" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="DistributedHashTable.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/dht/DistributedHashTable.java">
+ <file leaf-file-name="package-info.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="362" column="55" selection-start="10183"
selection-end="10183" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="NetworkSizeEstimation.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/nse/NetworkSizeEstimation.java">
+ <file leaf-file-name="Client.java" pinned="false" current="false"
current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Client.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="72" column="18" selection-start="1992"
selection-end="1992" vertical-scroll-proportion="0.0">
- <folding />
+ <state line="52" column="6" selection-start="1533"
selection-end="1533" vertical-scroll-proportion="0.0">
+ <folding>
+ <element signature="e#0#6814#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Core.java" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/core/Core.java">
+ <file leaf-file-name="package-info.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/nse/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="709" column="79" selection-start="20929"
selection-end="20929" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="e#11559#11999#0" expanded="true" />
- <element signature="e#11984#11985#0" expanded="true" />
- </folding>
+ <state line="1" column="25" selection-start="29"
selection-end="29" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Statistics.java" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/statistics/Statistics.java">
+ <file leaf-file-name="package-info.java" pinned="false" current="true"
current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/org/grothoff/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="141" column="55" selection-start="4328"
selection-end="4328" vertical-scroll-proportion="0.0">
+ <state line="4" column="0" selection-start="90" selection-end="90"
vertical-scroll-proportion="0.14686824">
<folding />
</state>
</provider>
@@ -191,22 +193,22 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option
value="$PROJECT_DIR$/src/org/gnunet/construct/parsers/NestedParser.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/util/Connection.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/construct/Construct.java"
/>
+ <option
value="$PROJECT_DIR$/src/org/gnunet/construct/parsers/Parser.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/util/Scheduler.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/util/Configuration.java" />
+ <option
value="$PROJECT_DIR$/src/org/gnunet/dht/DistributedHashTable.java" />
<option value="$PROJECT_DIR$/src/org/gnunet/util/Server.java" />
- <option
value="$PROJECT_DIR$/src/org/gnunet/construct/MessageIdAnnotationProcessor.java"
/>
- <option
value="$PROJECT_DIR$/src/org/gnunet/construct/MessageLoader.java" />
- <option value="$PROJECT_DIR$/src/org/gnunet/util/Strings.java" />
- <option value="$PROJECT_DIR$/src/org/gnunet/util/Connectoin.java" />
- <option value="$PROJECT_DIR$/src/org/gnunet/util/Scheduler.java" />
- <option value="$PROJECT_DIR$/ISSUES" />
- <option
value="$PROJECT_DIR$/src/org/gnunet/util/MessageTransmitter.java" />
- <option value="$PROJECT_DIR$/src/org/gnunet/util/Resolver.java" />
- <option
value="$PROJECT_DIR$/src/org/gnunet/nse/NetworkSizeEstimation.java" />
<option value="$PROJECT_DIR$/src/org/gnunet/core/Core.java" />
- <option
value="$PROJECT_DIR$/src/org/gnunet/statistics/Statistics.java" />
- <option
value="$PROJECT_DIR$/src/org/gnunet/dht/DistributedHashTable.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/core/package-info.java" />
+ <option
value="$PROJECT_DIR$/src/org/gnunet/statistics/package-info.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/dht/package-info.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/util/package-info.java" />
+ <option
value="$PROJECT_DIR$/src/org/gnunet/util/getopt/package-info.java" />
<option value="$PROJECT_DIR$/src/org/gnunet/util/Client.java" />
- <option value="$PROJECT_DIR$/src/org/gnunet/util/Connection.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/nse/package-info.java" />
+ <option value="$PROJECT_DIR$/src/org/grothoff/package-info.java" />
</list>
</option>
</component>
@@ -323,6 +325,10 @@
<option name="myItemId" value="org" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="grothoff" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -371,6 +377,14 @@
<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>
@@ -394,6 +408,84 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="statistics" />
+ <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="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_ELEMENT>
+ <option name="myItemId" value="nse" />
+ <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="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_ELEMENT>
+ <option name="myItemId" value="dht" />
+ <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="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_ELEMENT>
<option name="myItemId" value="core" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -458,6 +550,7 @@
</panes>
</component>
<component name="PropertiesComponent">
+ <property name="last_directory_selection"
value="$PROJECT_DIR$/src/org/gnunet/construct" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="OverrideImplement.combined" value="true" />
<property name="options.splitter.main.proportions" value="0.3" />
@@ -473,6 +566,11 @@
<property name="options.searchVisible" value="true" />
</component>
<component name="RecentsManager">
+ <key name="CopyFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/src/org/grothoff" />
+ <recent name="$PROJECT_DIR$/src/org/gnunet/nse" />
+ <recent name="$PROJECT_DIR$/src/org/gnunet/dht" />
+ </key>
<key name="IntroduceConstantDialog.RECENTS_KEY">
<recent name="org.gnunet.nse.NetworkSizeEstimation.StartMessage" />
</key>
@@ -482,9 +580,125 @@
<recent name="org.gnunet.util" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.gnunet.construct" />
<recent name="org.gnunet.util" />
</key>
</component>
+ <component name="RestoreUpdateTree">
+ <UpdateInfo date="Moments ago" ActionInfo="_Update">
+ <UpdatedFiles>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Updated from server" />
+ <option name="myStatusName" value="Changed on server" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="CHANGED_ON_SERVER" />
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Updated" />
+ <option name="myStatusName" value="Changed" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="UPDATED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Created" />
+ <option name="myStatusName" value="Created" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="CREATED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Deleted" />
+ <option name="myStatusName" value="Deleted" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="true" />
+ <option name="myId" value="REMOVED_FROM_REPOSITORY" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Restored" />
+ <option name="myStatusName" value="Will be restored" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="RESTORED" />
+ <PATH vcs="svn" revision="21067">$PROJECT_DIR$/ISSUES</PATH>
+ <PATH vcs="svn"
revision="21067">$PROJECT_DIR$/doc/gnunet-exercise.tex</PATH>
+ <PATH vcs="svn"
revision="21067">$PROJECT_DIR$/gnunet-java.eml</PATH>
+ <PATH vcs="svn"
revision="21067">$PROJECT_DIR$/gnunet-java.iml</PATH>
+ </FILE-GROUP>
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Modified" />
+ <option name="myStatusName" value="Modified" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MODIFIED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Skipped" />
+ <option name="myStatusName" value="Skipped" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="SKIPPED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Merged with conflicts" />
+ <option name="myStatusName" value="Will be merged with conflicts" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MERGED_WITH_CONFLICTS" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Merged with tree conflicts" />
+ <option name="myStatusName" value="Merged with tree conflicts" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Merged" />
+ <option name="myStatusName" value="Will be merged" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MERGED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Not in repository" />
+ <option name="myStatusName" value="Not in repository" />
+ <option name="mySupportsDeletion" value="true" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="UNKNOWN" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Locally added" />
+ <option name="myStatusName" value="Locally added" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="LOCALLY_ADDED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Locally removed" />
+ <option name="myStatusName" value="Locally removed" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="LOCALLY_REMOVED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Switched" />
+ <option name="myStatusName" value="Switched" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="SWITCHED" />
+ </FILE-GROUP>
+ <FILE-GROUP>
+ <option name="myUpdateName" value="Merged with property conflicts" />
+ <option name="myStatusName" value="Will be merged with property
conflicts" />
+ <option name="mySupportsDeletion" value="false" />
+ <option name="myCanBeAbsent" value="false" />
+ <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
+ </FILE-GROUP>
+ </UpdatedFiles>
+ </UpdateInfo>
+ </component>
<component name="RunManager" selected="JUnit.ConstructTest">
<configuration default="false" name="IntegerParserTest" type="JUnit"
factoryName="JUnit" temporary="true">
<module name="gnunet-java" />
@@ -689,24 +903,24 @@
<frame x="-6" y="17" width="1460" height="892" extended-state="6" />
<editor active="true" />
<layout>
- <window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32784638" 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.33" 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.32921812" 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.33"
sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6351166"
sideWeight="0.5" 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.24841213" sideWeight="0.5020576" order="1" side_tool="true"
content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24841213"
sideWeight="0.67215365" order="0" side_tool="false" content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3282967"
sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Event Log" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32967034" sideWeight="0.5" order="7" side_tool="true"
content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.24982257" sideWeight="0.6318681" 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.32967034" sideWeight="0.5" order="7" side_tool="true"
content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.32921812" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32784638" sideWeight="0.5" order="7" 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.33"
sideWeight="0.5" order="6" 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.24841213" sideWeight="0.5020576" order="1" side_tool="true"
content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24841213"
sideWeight="0.6707819" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32647464"
sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32921812" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
+ <window_info id="Inspection" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.3648834" sideWeight="0.5" order="5" side_tool="false"
content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25"
sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="0" 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.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- <window_info id="Inspection" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.3997253" sideWeight="0.5" order="5" side_tool="false"
content_ui="tabs" />
</layout>
</component>
<component name="VcsContentAnnotationSettings">
@@ -746,7 +960,7 @@
<option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="added mechanism to find new
MsgMap.txt files" />
+ <option name="LAST_COMMIT_MESSAGE" value="added documentation" />
<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" />
@@ -767,133 +981,131 @@
<MESSAGE value="core now working, several fixes in construct, started
implementing the server/service" />
<MESSAGE value="added make-jar tool" />
<MESSAGE value="added mechanism to find new MsgMap.txt files" />
+ <MESSAGE value="split Client into Client and Connection" />
+ <MESSAGE value="added comments, fixed stuff, revising statistics API
implementation" />
+ <MESSAGE value="improved the statistics API" />
+ <MESSAGE value="added some documentation" />
+ <MESSAGE value="added documentation" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/MessageUnion.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Configuration.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="17" selection-start="95" selection-end="95"
vertical-scroll-proportion="0.0" />
+ <state line="40" column="28" selection-start="1287"
selection-end="1287" vertical-scroll-proportion="0.0">
+ <folding>
+ <element signature="e#11758#11764#0" expanded="true" />
+ </folding>
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Strings.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/getopt/Parser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="25" selection-start="886" selection-end="886"
vertical-scroll-proportion="0.0">
+ <state line="21" column="5" selection-start="605" selection-end="605"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="jar:///usr/lib/jvm/java-6-sun/jre/lib/rt.jar!/java/util/EnumSet.class">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/dht/DistributedHashTable.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="22" selection-start="156" selection-end="156"
vertical-scroll-proportion="0.0">
+ <state line="242" column="46" selection-start="6360"
selection-end="6360" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/ISSUES">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Server.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="526" column="4" selection-start="19423"
selection-end="19423" vertical-scroll-proportion="0.0">
+ <state line="47" column="38" selection-start="1393"
selection-end="1393" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/MessageTransmitter.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/core/Core.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="47" selection-start="351" selection-end="351"
vertical-scroll-proportion="0.0">
+ <state line="16" column="2" selection-start="317" selection-end="353"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Scheduler.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/statistics/Statistics.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="223" column="85" selection-start="7868"
selection-end="7868" vertical-scroll-proportion="0.0">
+ <state line="22" column="0" selection-start="553" selection-end="594"
vertical-scroll-proportion="0.0">
<folding>
- <element signature="imports" expanded="true" />
+ <element signature="e#977#996#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/core/Core.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/core/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="709" column="79" selection-start="20929"
selection-end="20929" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="e#11559#11999#0" expanded="true" />
- <element signature="e#11984#11985#0" expanded="true" />
- </folding>
+ <state line="3" column="23" selection-start="67" selection-end="67"
vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/statistics/Statistics.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/dht/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="141" column="55" selection-start="4328"
selection-end="4328" vertical-scroll-proportion="0.0">
+ <state line="1" column="25" selection-start="29" selection-end="29"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/dht/DistributedHashTable.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/statistics/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="362" column="55" selection-start="10183"
selection-end="10183" vertical-scroll-proportion="0.0">
+ <state line="1" column="33" selection-start="37" selection-end="37"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/nse/NetworkSizeEstimation.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="72" column="18" selection-start="1992"
selection-end="1992" vertical-scroll-proportion="0.0">
+ <state line="1" column="41" selection-start="45" selection-end="45"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Resolver.java">
+ <entry file="file://$PROJECT_DIR$/src/org/grothoff/Runabout.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="217" column="13" selection-start="6126"
selection-end="6126" vertical-scroll-proportion="0.0">
+ <state line="40" column="38" selection-start="1934"
selection-end="1934" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/GnunetMessage.java">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/getopt/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="19" selection-start="78" selection-end="78"
vertical-scroll-proportion="0.0">
+ <state line="1" column="30" selection-start="34" selection-end="34"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/package-info.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Client.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="135" column="36" selection-start="5315"
selection-end="5315" vertical-scroll-proportion="0.0">
+ <state line="52" column="6" selection-start="1533"
selection-end="1533" vertical-scroll-proportion="0.0">
<folding>
- <element signature="e#0#6780#0" expanded="true" />
- <element signature="e#4898#5537#0" expanded="true" />
- <element signature="e#5522#5523#0" expanded="true" />
- <marker date="1334958405000" expanded="true" signature="6496:6581"
placeholder="/**...*/" />
- <marker date="1334958405000" expanded="true" signature="6619:6659"
placeholder="{...}" />
+ <element signature="e#0#6814#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Server.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/nse/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="0" selection-start="593" selection-end="593"
vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Program.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="11" column="22" selection-start="282" selection-end="282"
vertical-scroll-proportion="0.0">
+ <state line="1" column="25" selection-start="29" selection-end="29"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Connection.java">
+ <entry file="file://$PROJECT_DIR$/src/org/grothoff/package-info.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="412" column="0" selection-start="14820"
selection-end="14820" vertical-scroll-proportion="0.3086771">
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#12652#13034#0" expanded="true" />
- <element signature="e#13019#13020#0" expanded="true" />
- <element signature="e#17483#17621#0" expanded="true" />
- <element signature="e#17610#17611#0" expanded="true" />
- </folding>
+ <state line="4" column="0" selection-start="90" selection-end="90"
vertical-scroll-proportion="0.14686824">
+ <folding />
</state>
</provider>
</entry>
Modified: gnunet-java/src/org/gnunet/construct/Construct.java
===================================================================
--- gnunet-java/src/org/gnunet/construct/Construct.java 2012-04-22 14:16:25 UTC
(rev 21067)
+++ gnunet-java/src/org/gnunet/construct/Construct.java 2012-04-22 15:51:22 UTC
(rev 21068)
@@ -12,25 +12,23 @@
import java.util.*;
-
/*
Wanted syntax (not fully implemented yet)
- @(U)Int<n> => signed or unsigned fixnum, represented by n bits
- @NestedMessage => nested message
- @FillWith @(U)Int<n> => fill the rest of the message with the specified
fixnum, annotation valid on primitive arrays
- @FillWith @NestedMessage => fill the rest of the message with the specified
fixnum, annotation valid on message arrays
- of the wanted type
+ of the wanted type
- @VariableSizeArray(lengthField = "<field>") => same syntax as @FillWith
- @FixedSizeArray(length = n) => same syntax as @FillWith
- @Double / @Float => floating point number, should also work with the array
annotations
- @FrameSize => specifies the fixnum that determines the containing frame's
size
- @ZeroTerminatedString => self-explanatory
- @Constructable => annotation on a class that implements the
ConstructableMessage interface,
- providing methods to serialize/unserialize itself.
- */
+ providing methods to serialize/unserialize itself.
+*/
-
/**
* Parse and write the binary representation of java classes, as defined by
org.gnunet.construct.*-Annotations
* on their members.
@@ -43,19 +41,20 @@
.getLogger(Construct.class);
- private static HashMap<Class<? extends Message>, Parser> parserCache = new
HashMap<Class<? extends Message>, Parser>(100);
+ private static HashMap<Class<? extends Message>, Parser> parserCache = new
HashMap<Class<? extends Message>,
+ Parser>(100);
/**
* Information the root of the parser, if the target is nested in another
message.
*/
private static class ParserContext {
ArrayList<Field> frameSizePath = new ArrayList<Field>();
- ArrayList<Field> parserPath = new ArrayList<Field>();
+ List<Field> parserPath = new ArrayList<Field>();
@Override
public boolean equals(Object other) {
// parsers with an equal parserPath also always have the same
frameSizePath
- return this.parserPath.equals(((ParserContext)other).parserPath);
+ return this.parserPath.equals(((ParserContext) other).parserPath);
}
@Override
@@ -71,7 +70,6 @@
}
-
/**
* Given a byte buffer with a message, parse it into an object of type c.
The
* fields of the class are expected to be annotated with annotations from
@@ -274,13 +272,13 @@
}
public void visit(IntegerFill i) {
- parser = new IntegerFillParser(frameSizePath, field, i.signed(),
i.bitSize()/8);
+ parser = new IntegerFillParser(frameSizePath, field, i.signed(),
i.bitSize() / 8);
}
public void visit(NestedMessage n) {
if (!Message.class.isAssignableFrom(field.getType())) {
throw new AssertionError("@NestedMessage only works on
messages, " + field.getType()
- + " is not a message (origin: " + c +
")");
+ + " is not a message (origin: " + c + ")");
}
Field nestedField = field;
@@ -350,7 +348,7 @@
Parser p = getParser((Class<? extends Message>) field.getType()
.getComponentType(), this);
- parser = new FillParser(p, frameSizePath ,f);
+ parser = new FillParser(p, frameSizePath, f);
}
public void visit(VariableSizeArray vsa) {
@@ -396,8 +394,8 @@
* the object are expected to be annotated with annotations from the
* construct package.
*
- * @param o object to serialize
* @param dstBuf where to write the binary object data
+ * @param msg object to serialize
* @return number of bytes written to data, -1 on error
*/
public static int write(ByteBuffer dstBuf, Message msg) {
Modified: gnunet-java/src/org/gnunet/construct/MessageIdAnnotationProcessor.java
===================================================================
--- gnunet-java/src/org/gnunet/construct/MessageIdAnnotationProcessor.java
2012-04-22 14:16:25 UTC (rev 21067)
+++ gnunet-java/src/org/gnunet/construct/MessageIdAnnotationProcessor.java
2012-04-22 15:51:22 UTC (rev 21068)
@@ -25,8 +25,6 @@
@SupportedSourceVersion(SourceVersion.RELEASE_6)
public class MessageIdAnnotationProcessor extends AbstractProcessor {
Map<String, Map<Integer, String>> unionmap = new HashMap<String,
Map<Integer, String>>(100);
- private Types types = null;
- private Elements elements = null;
@Override
public boolean process(Set<? extends TypeElement> typeElements,
RoundEnvironment roundEnvironment) {
@@ -34,8 +32,8 @@
return false;
}
- this.types = processingEnv.getTypeUtils();
- this.elements = processingEnv.getElementUtils();
+ Types types = processingEnv.getTypeUtils();
+ Elements elements = processingEnv.getElementUtils();
if (roundEnvironment.processingOver()) {
Filer filer = processingEnv.getFiler();
Modified: gnunet-java/src/org/gnunet/construct/parsers/Parser.java
===================================================================
--- gnunet-java/src/org/gnunet/construct/parsers/Parser.java 2012-04-22
14:16:25 UTC (rev 21067)
+++ gnunet-java/src/org/gnunet/construct/parsers/Parser.java 2012-04-22
15:51:22 UTC (rev 21068)
@@ -27,10 +27,9 @@
/**
*
- * @param dstData
- * @param offset
- * @param srcObj
- * @return
+ * @param dstBuf destination buffer for the binary representation of the
object
+ * @param srcObj object to serialize to binary form
+ * @return number of bytes written to buf (todo: we are using a ByteBuffer
now, this is obsolete)
*/
public int write(ByteBuffer dstBuf, Message srcObj);
Modified: gnunet-java/src/org/gnunet/core/Core.java
===================================================================
--- gnunet-java/src/org/gnunet/core/Core.java 2012-04-22 14:16:25 UTC (rev
21067)
+++ gnunet-java/src/org/gnunet/core/Core.java 2012-04-22 15:51:22 UTC (rev
21068)
@@ -41,8 +41,6 @@
private ConnectHandler connectHandler;
private DisconnectHandler disconnectHandler;
- private PeerIdentity myIdentity;
-
private final CoreReceiver coreReceiver = new CoreReceiver();
// per default we are interested in all messages => specific interest set
is empty
@@ -385,10 +383,8 @@
}
public class CoreReceiver extends RunaboutMessageReceiver {
-
-
public void visit(InitReplyMessage m) {
- myIdentity = m.myIdentity;
+ PeerIdentity myIdentity = m.myIdentity;
connectedPeers.put(myIdentity, new ConnectedPeerInfo());
if (init != null) {
@@ -491,19 +487,19 @@
* @param target the identity of the receiver
* @param size the size of the message we want to transmit
* @param transmitter called once the core service is ready to send message
- * @return
+ * @return a handle to cancel the notification
*/
public Cancelable notifyTransmitReady(long priority, RelativeTime maxdelay,
- PeerIdentity targetIdentity, int
size, final MessageTransmitter transmitter) {
- if (!connectedPeers.containsKey(targetIdentity)) {
+ PeerIdentity target, int size, final
MessageTransmitter transmitter) {
+ if (!connectedPeers.containsKey(target)) {
throw new AssertionError("trying to send message to unconnected
peer");
}
- ConnectedPeerInfo cpi = connectedPeers.get(targetIdentity);
+ ConnectedPeerInfo cpi = connectedPeers.get(target);
final TransmitHandle transmitHandle = new TransmitHandle();
- transmitHandle.peerIdentity = targetIdentity;
+ transmitHandle.peerIdentity = target;
transmitHandle.size = size;
transmitHandle.smrId = cpi.nextSmrId;
transmitHandle.transmitter = transmitter;
@@ -658,16 +654,6 @@
}
- public static class BlaRunabout extends Runabout {
- public void visit(SendMessage x) {
-
- }
-
- public void visit(SendMessageReady x) {
-
- }
- }
-
@UnionCase(42001)
public static class MyMessage implements GnunetMessage.Body {
@UInt32
Added: gnunet-java/src/org/gnunet/core/package-info.java
===================================================================
--- gnunet-java/src/org/gnunet/core/package-info.java
(rev 0)
+++ gnunet-java/src/org/gnunet/core/package-info.java 2012-04-22 15:51:22 UTC
(rev 21068)
@@ -0,0 +1,4 @@
+/**
+ * API for the gnunet core service.
+ */
+package org.gnunet.core;
Modified: gnunet-java/src/org/gnunet/dht/DistributedHashTable.java
===================================================================
--- gnunet-java/src/org/gnunet/dht/DistributedHashTable.java 2012-04-22
14:16:25 UTC (rev 21067)
+++ gnunet-java/src/org/gnunet/dht/DistributedHashTable.java 2012-04-22
15:51:22 UTC (rev 21068)
@@ -10,6 +10,7 @@
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
+import java.util.Set;
/**
@@ -200,12 +201,12 @@
/**
* Called when the dht returns a result
*
- * @param expiration
- * @param key
- * @param getPath
- * @param putPath
- * @param type
- * @param data
+ * @param expiration expiration of the returned entry
+ * @param key key of the returned entry
+ * @param getPath put path of the returned entry
+ * @param putPath put path of the returned entry
+ * @param type type of data in the entry
+ * @param data data of the returned entry
*/
public void handleResult(AbsoluteTime expiration, HashCode key,
List<PeerIdentity> getPath,
List<PeerIdentity> putPath,
@@ -221,7 +222,6 @@
private Client client;
private long uid = 1;
- private Configuration cfg;
/**
* Create a connection with the DHT service.
@@ -229,7 +229,7 @@
* @param cfg the configuration to use
*/
public DistributedHashTable(Configuration cfg) {
- this.cfg = cfg;
+ Configuration cfg1 = cfg;
client = new Client("dht", cfg);
}
@@ -240,13 +240,13 @@
* @param key key key to store the data under
* @param data data data to store
* @param replicationLevel how many peers should store this value
- * @param routeOptions
- * @param type
+ * @param routeOptions additional options
+ * @param type type of the data to store
* @param expiration how long should the value be stored? TODO: what is
the maximum?
* @param timeout how long after we give up on storing the value?
* @param cont called after the put operation failed or succeeded
*/
- public void put(HashCode key, byte[] data, int replicationLevel,
EnumSet<RouteOption> routeOptions,
+ public void put(HashCode key, byte[] data, int replicationLevel,
Set<RouteOption> routeOptions,
BlockType type, AbsoluteTime expiration,
RelativeTime timeout, final Continuation cont) {
final DHTClientPutMessage cpm = new DHTClientPutMessage();
@@ -354,17 +354,17 @@
/**
* Request results from the DHT.
*
- * @param timeout
- * @param type
- * @param key
- * @param replication
- * @param routeOptions
- * @param xquery
- * @param cb
- * @return
+ * @param timeout timeout for the request
+ * @param type which type of data do we want to query for? (the DHT does
not support TYPE_ANY)
+ * @param key the key we want to query
+ * @param replication how many peers do we want to ask?
+ * @param routeOptions extra routing options, null for default
+ * @param xquery extra query parameters, defaults to null
+ * @param cb the callback object for results or failure indication
+ * @return a handle to cancel the request
*/
public Cancelable startGet(RelativeTime timeout, BlockType type, HashCode
key,
- int replication, int routeOptions,
+ int replication, EnumSet<RouteOption>
routeOptions,
byte[] xquery, ResultCallback cb) {
final GetRequest request = new GetRequest();
@@ -375,7 +375,7 @@
final DHTClientGetMessage getMessage = new DHTClientGetMessage();
getMessage.desiredReplicationLevel = replication;
getMessage.key = key;
- getMessage.options = routeOptions;
+ getMessage.options = 0;
getMessage.xquery = xquery;
getMessage.type = type.val;
getMessage.uniqueId = request.uid;
@@ -421,7 +421,7 @@
/**
* not yet implemented
- * @return
+ * @return a handle to cancel the monitoring
*/
public Cancelable startMonitor() {
return null;
@@ -510,7 +510,7 @@
final DistributedHashTable dht = new
DistributedHashTable(cfg);
- dht.startGet(RelativeTime.SECOND, BlockType.TEST, new
HashCode(key), replication, 0,
+ dht.startGet(RelativeTime.SECOND, BlockType.TEST, new
HashCode(key), replication, null,
new byte[0], new ResultCallback() {
@Override
public void handleResult(AbsoluteTime expiration,
HashCode key, List<PeerIdentity>
Added: gnunet-java/src/org/gnunet/dht/package-info.java
===================================================================
--- gnunet-java/src/org/gnunet/dht/package-info.java
(rev 0)
+++ gnunet-java/src/org/gnunet/dht/package-info.java 2012-04-22 15:51:22 UTC
(rev 21068)
@@ -0,0 +1,4 @@
+/**
+ * API for the gnunet dht service.
+ */
+package org.gnunet.dht;
Added: gnunet-java/src/org/gnunet/nse/package-info.java
===================================================================
--- gnunet-java/src/org/gnunet/nse/package-info.java
(rev 0)
+++ gnunet-java/src/org/gnunet/nse/package-info.java 2012-04-22 15:51:22 UTC
(rev 21068)
@@ -0,0 +1,4 @@
+/**
+ * API for the gnunet nse service.
+ */
+package org.gnunet.nse;
Modified: gnunet-java/src/org/gnunet/statistics/Statistics.java
===================================================================
--- gnunet-java/src/org/gnunet/statistics/Statistics.java 2012-04-22
14:16:25 UTC (rev 21067)
+++ gnunet-java/src/org/gnunet/statistics/Statistics.java 2012-04-22
15:51:22 UTC (rev 21068)
@@ -78,11 +78,32 @@
private abstract class StatisticsRequest implements Cancelable,
MessageTransmitter {
public String name;
public String subsystem;
- public StatisticsReceiver receiver;
public AbsoluteTime deadline;
}
+
+
+
+
private class StatisticsGetRequest extends StatisticsRequest implements
Cancelable {
+ public StatisticsReceiver receiver;
+
+ public class GetResponseHandler extends RunaboutMessageReceiver {
+ public void visit(ResponseValueMessage m) {
+ receiver.onReceive(m.subsystemName, m.statisticName, m.value);
+ client.receive(deadline.getRemaining(), this);
+ }
+
+ public void visit(ResponseEndMessage m) {
+ receiver.onDone();
+ }
+
+ @Override
+ public void handleError() {
+ logger.error("unable to read from statistics service");
+ }
+ }
+
@Override
public void cancel() {
requests.remove(this);
@@ -100,26 +121,7 @@
sink.send(rm);
- client.receive(deadline.getRemaining(), new MessageReceiver() {
- @Override
- public void process(GnunetMessage.Body msg) {
- if (msg instanceof ResponseValueMessage) {
- ResponseValueMessage rvm = (ResponseValueMessage) msg;
- receiver.onReceive(rvm.subsystemName,
rvm.statisticName, rvm.value);
- client.receive(deadline.getRemaining(), this);
- } else if (msg instanceof ResponseEndMessage) {
- receiver.onDone();
- logger.info("all statistics received");
- } else {
- logger.error("message format error in response from
the service");
- }
- }
-
- @Override
- public void handleError() {
- logger.error("unable to read from statistics service");
- }
- });
+ client.receive(deadline.getRemaining(), new GetResponseHandler());
}
@Override
@@ -214,12 +216,13 @@
/**
+ * Sets a statistics value asynchronously.
*
- * @param subsystem
- * @param name
- * @param value
+ * @param subsystem subsystem of the entry
+ * @param name name of the entry
+ * @param value desired value
* @param persist keep value even if the statistics service restarts
- * @return
+ * @return a handle to cancel the request
*/
public Cancelable set(final String subsystem, final String name, final
long value, boolean persist) {
StatisticsPutRequest putRequest = new StatisticsPutRequest();
Added: gnunet-java/src/org/gnunet/statistics/package-info.java
===================================================================
--- gnunet-java/src/org/gnunet/statistics/package-info.java
(rev 0)
+++ gnunet-java/src/org/gnunet/statistics/package-info.java 2012-04-22
15:51:22 UTC (rev 21068)
@@ -0,0 +1,4 @@
+/**
+ * API for the gnunet statistics service.
+ */
+package org.gnunet.statistics;
Modified: gnunet-java/src/org/gnunet/util/AbsoluteTime.java
===================================================================
--- gnunet-java/src/org/gnunet/util/AbsoluteTime.java 2012-04-22 14:16:25 UTC
(rev 21067)
+++ gnunet-java/src/org/gnunet/util/AbsoluteTime.java 2012-04-22 15:51:22 UTC
(rev 21068)
@@ -53,8 +53,8 @@
/**
* Adds a relative time value to an absolute time.
*
- * @param duration
- * @return this + duration
+ * @param duration duration to add to address@hidden this}
+ * @return address@hidden this + duration}
*/
public AbsoluteTime add(RelativeTime duration) {
if (abs_value == Long.MAX_VALUE
@@ -141,7 +141,7 @@
/**
* Calculates the difference between two absolute times.
*
- * @param other
+ * @param other ...
* @return this - other
*/
public RelativeTime getDifference(final AbsoluteTime other) {
@@ -155,7 +155,7 @@
* Gets the duration of an operation as the difference of the current time
* and address@hidden this}.
*
- * @return start_time(=this) - now
+ * @return this - now
*/
public RelativeTime getDuration() {
assert abs_value != Long.MAX_VALUE;
@@ -183,7 +183,7 @@
/**
* Returns the maximum of two time values.
*
- * @param other
+ * @param other ...
* @return max(this,other)
*/
public AbsoluteTime max(final AbsoluteTime other) {
@@ -194,7 +194,7 @@
/**
* Returns the minimum of two time values.
*
- * @param other
+ * @param other ...
* @return min(this,other)
*/
public AbsoluteTime min(final AbsoluteTime other) {
@@ -204,7 +204,7 @@
/**
* Subtracts a relative time value to an absolute time
*
- * @param duration
+ * @param duration ...
* @return this - duration
*/
public AbsoluteTime subtract(final RelativeTime duration) {
Modified: gnunet-java/src/org/gnunet/util/Client.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Client.java 2012-04-22 14:16:25 UTC (rev
21067)
+++ gnunet-java/src/org/gnunet/util/Client.java 2012-04-22 15:51:22 UTC (rev
21068)
@@ -45,14 +45,12 @@
/**
* Initial value for connectBackoff.
*
- * @see connectBackoff
*/
private final RelativeTime INITAL_BACKOFF = RelativeTime.MILLISECOND;
/**
* Maximum value for connectBackoff.
*
- * @see Client.connectBackoff
*/
private final RelativeTime MAX_BACKOFF = RelativeTime.SECOND.multiply(5);
@@ -71,6 +69,9 @@
* @param cfg configuration to use
*/
public Client(String serviceName, Configuration cfg) {
+ if (cfg == null) {
+ throw new AssertionError("Configuration may not be null");
+ }
// get port of this service from the configuration
port = (int) cfg.getValueNumer(serviceName, "PORT");
// get the hostname from the configuration
@@ -119,7 +120,7 @@
public Cancelable notifyTransmitReady(final RelativeTime timeout,
final boolean autoRetry, int size,
final MessageTransmitter transmitter) {
if (connection.isConnected()) {
- return connection.notifyTransmitReady(timeout, transmitter);
+ return connection.notifyTransmitReady(0, timeout, transmitter);
} else {
logger.debug("notifyTransmitReady delayed");
final DelayedTransmitHandle delayedTransmitHandle = new
DelayedTransmitHandle();
@@ -127,7 +128,7 @@
@Override
public void run(Scheduler.RunContext ctx) {
if (connection.isConnected()) {
- connection.notifyTransmitReady(timeout, transmitter);
+ connection.notifyTransmitReady(0, timeout,
transmitter);
} else {
logger.debug("still not connected, retrying in {}ms",
connectBackoff.getMilliseconds());
reconnect();
Modified: gnunet-java/src/org/gnunet/util/Configuration.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Configuration.java 2012-04-22 14:16:25 UTC
(rev 21067)
+++ gnunet-java/src/org/gnunet/util/Configuration.java 2012-04-22 15:51:22 UTC
(rev 21068)
@@ -39,7 +39,6 @@
* @author Florian Dold
*/
public class Configuration {
- @SuppressWarnings("serial")
public static class ParsingError extends RuntimeException {
ParsingError(String msg) {
super(msg);
@@ -144,8 +143,8 @@
/**
* Get a configuration value that should be a number
*
- * @param section
- * @param option
+ * @param section section of interest
+ * @param option option of interest
* @return null if value not in configuration, the option's value otherwise
*/
public long getValueNumer(String section, String option) {
@@ -175,10 +174,10 @@
/**
* Set an option to a string value in a section.
*
- * @param section
- * @param option
+ * @param section section of interest
+ * @param option option of interest
* @throws ParsingError
- * @return
+ * @return value
*/
public String getValueString(String section, String option) {
ensureSectionExists(section);
@@ -305,9 +304,9 @@
/**
* Set an option to a string value in a section.
*
- * @param section
- * @param option
- * @param value
+ * @param section section of interest
+ * @param option option of interest
+ * @param value value to set
*/
public void setValueNumber(String section, String option,
long value) {
@@ -317,9 +316,9 @@
/**
* Set an option to a string value in a section.
*
- * @param section
- * @param option
- * @param value
+ * @param section section of interest
+ * @param option option of interest
+ * @param value value to set
*/
public void setValueString(String section, String option,
String value) {
@@ -354,7 +353,7 @@
public void loadDefaults() {
- ArrayList<File> dirs = new ArrayList<File>();
+ Collection<File> dirs = new ArrayList<File>(5);
dirs.add(new File("/usr/share/gnunet/config.d/"));
dirs.add(new File("/usr/local/share/gnunet/config.d/"));
String pfx = System.getenv("GNUNET_PREFIX");
Modified: gnunet-java/src/org/gnunet/util/Connection.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Connection.java 2012-04-22 14:16:25 UTC
(rev 21067)
+++ gnunet-java/src/org/gnunet/util/Connection.java 2012-04-22 15:51:22 UTC
(rev 21068)
@@ -27,7 +27,7 @@
*/
private SocketChannel connectionChannel = null;
- private LinkedList<AddressProbe> addressProbes = null;
+ private Iterable<AddressProbe> addressProbes = null;
/**
@@ -458,13 +458,14 @@
/**
* Call notify once the we are ready to transmit data.
*
+ *
* @param size number of bytes to send
* @param timeout after how long should we give up (and call
transmitter.transmit(null))
* @param transmitter the MessageTransmitter object to call once the
client is ready to transmit or
* when the timeout is over. Guaranteed to be called
*after* notifyTransmitReady has returned.
* @return a handle that can be used to cancel the transmit request, null
if request could be satisfied immediately
*/
- public TransmitHandle notifyTransmitReady(RelativeTime timeout, final
MessageTransmitter transmitter) {
+ public TransmitHandle notifyTransmitReady(int size, RelativeTime timeout,
final MessageTransmitter transmitter) {
if (nextTransmitHelper != null) {
throw new AssertionError(
"previous transmit request must have completed before
calling notifyTransmitReady again");
Modified: gnunet-java/src/org/gnunet/util/HashCode.java
===================================================================
--- gnunet-java/src/org/gnunet/util/HashCode.java 2012-04-22 14:16:25 UTC
(rev 21067)
+++ gnunet-java/src/org/gnunet/util/HashCode.java 2012-04-22 15:51:22 UTC
(rev 21068)
@@ -25,7 +25,7 @@
/**
* Create a HashCode of the String using SHA-512
- * @param s
+ * @param s the string to hash
*/
public HashCode(String s) {
MessageDigest digest;
Modified: gnunet-java/src/org/gnunet/util/Program.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Program.java 2012-04-22 14:16:25 UTC
(rev 21067)
+++ gnunet-java/src/org/gnunet/util/Program.java 2012-04-22 15:51:22 UTC
(rev 21068)
@@ -63,7 +63,8 @@
* While executing the scheduler is guaranteed to run, command arguments
are parsed,
* the default configuration is loaded and the DNS Resolver is initialized.
*
- * @param args
+ * @param args array of command line arguments to parse. used to
automatically load additional settings
+ * and configure log levels.
*/
public Program(String[] args) {
this.args = args;
@@ -134,7 +135,7 @@
/**
* Override to display a different version description on "-h/--help"
*
- * @return
+ * @return version description
*/
protected String makeVersionDescription() {
return "development version of gnunet-java";
Modified: gnunet-java/src/org/gnunet/util/Resolver.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Resolver.java 2012-04-22 14:16:25 UTC
(rev 21067)
+++ gnunet-java/src/org/gnunet/util/Resolver.java 2012-04-22 15:51:22 UTC
(rev 21068)
@@ -153,13 +153,13 @@
}
/**
- * Callbacks for hostname resolution
+ * Callback object for hostname resolution.
*/
public interface AddressCallback {
/**
* Called for every address the requested hostname resolves to.
*
- * @param addr
+ * @param addr address for the resolved name
*/
public void onAddress(InetAddress addr);
@@ -180,7 +180,7 @@
*
* Usually called by the entry points Program/Service.
*
- * @param cfg
+ * @param cfg configuration to use
*/
public void setConfiguration(Configuration cfg) {
this.cfg = cfg;
@@ -249,12 +249,12 @@
/**
* Resolve the hostname 'hostname'.
*
- * @param hostname
- * @param timeout
- * @param cb
- * @return
+ * @param hostname hostname to resolve
+ * @param timeout timeout, calls cb.onTimeout on expiratoin
+ * @param cb callback
+ * @return a handle to cancel the request
*/
- public ResolveHandle resolveHostname(String hostname, RelativeTime
timeout, final AddressCallback cb) {
+ public Cancelable resolveHostname(String hostname, RelativeTime timeout,
final AddressCallback cb) {
final ResolveHandle rh = new ResolveHandle();
rh.hostname = hostname;
rh.deadline = timeout.toAbsolute();
@@ -404,8 +404,8 @@
/**
* Return a textual representation of an InetAddress. Shortens IPv6
addresses.
*
- * @param addr
- * @return
+ * @param addr the address to convert
+ * @return textual representation of the address
*/
public static String ipToString(InetAddress addr) {
byte[] a = addr.getAddress();
Modified: gnunet-java/src/org/gnunet/util/Scheduler.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Scheduler.java 2012-04-22 14:16:25 UTC
(rev 21067)
+++ gnunet-java/src/org/gnunet/util/Scheduler.java 2012-04-22 15:51:22 UTC
(rev 21068)
@@ -144,8 +144,8 @@
* Create a light-weight task identifier that is not registerd as
pending in the Scheduler,
* used for continuations.
*
- * @param t
- * @param ctx
+ * @param t task
+ * @param ctx the RunContext
*/
TaskIdentifier(Task t, RunContext ctx) {
this.task = t;
@@ -443,23 +443,9 @@
* scheduled for execution once either the delay has expired or any of
* the socket operations is ready. This is the most general
* function of the "add" family. Note that the "prerequisite_task"
- * must be satisfied in addition to any of the other conditions. In
- * other words, the task will be started when
- * address@hidden
- * (prerequisite-run)
- * && (delay-ready
- * || any-rs-ready
- * || any-ws-ready
- * || (disconnect-active && run-on-disconnect) )
- * }
+ * must be satisfied in addition to any of the other conditions.
*
* @param p how important is this task?
- * @param prerequisite_task run this task after the task with the given
- * task identifier completes (and any of our other
- * conditions, such as delay, read or
write-readiness
- * are satisfied). Use GNUNET_SCHEDULER_NO_TASK
to not have any dependency
- * on completion of other tasks.
- * @param prereq Prerequisite Task
* @param delay how long should we wait? Use
GNUNET_TIME_UNIT_FOREVER_REL for "forever",
* which means that the task will only be run
after we receive SIGTERM
* @param rs set of file descriptors we want to read (can
be NULL)
Modified: gnunet-java/src/org/gnunet/util/Server.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Server.java 2012-04-22 14:16:25 UTC (rev
21067)
+++ gnunet-java/src/org/gnunet/util/Server.java 2012-04-22 15:51:22 UTC (rev
21068)
@@ -42,19 +42,14 @@
* Notify us when the server has enough space to transmit
* a message of the given size to the given client.
*
- * @param client client to transmit message to
* @param size requested amount of buffer space
* @param timeout after how long should we give up (and call
* notify with buf NULL and size 0)?
- * @param callback function to call when space is available
- * @param callback_cls closure for callback
- * @return non-NULL if the notify callback was queued; can be used
- * to cancel the request using
- * GNUNET_CONNECTION_notify_transmit_ready_cancel.
- * NULL if we are already going to notify someone else (busy)
+ * @param transmitter callback
+ * @return a handle to cancel the notification
*/
public Cancelable notifyTransmitReady(int size, RelativeTime timeout,
MessageTransmitter transmitter) {
- return connection.notifyTransmitReady(timeout, transmitter);
+ return connection.notifyTransmitReady(0, timeout, transmitter);
}
/**
@@ -126,7 +121,7 @@
/**
- * @param srv
+ * @param srv ...
*/
private void doAccept(final ServerSocketChannel srv) {
Scheduler.TaskBuilder b = new Scheduler.TaskBuilder();
@@ -177,7 +172,7 @@
* There can only be one runabout per message type.
* (Discrepancy with the C-API, could be changed in the future)
*
- * @param cb
+ * @param cb handler
*/
public void addHandler(MessageRunabout cb) {
Class rc = cb.getClass();
Modified: gnunet-java/src/org/grothoff/Runabout.java
===================================================================
--- gnunet-java/src/org/grothoff/Runabout.java 2012-04-22 14:16:25 UTC (rev
21067)
+++ gnunet-java/src/org/grothoff/Runabout.java 2012-04-22 15:51:22 UTC (rev
21068)
@@ -185,8 +185,8 @@
Code co = null;
while (cl != null) {
Class[] ifc = cl.getInterfaces();
- for (int i = 0; i < ifc.length; i++) {
- Code r = map_.get(ifc[i]);
+ for (Class anIfc : ifc) {
+ Code r = map_.get(anIfc);
if (r != null) {
if ((co != null) && (r != co))
throw new RunaboutException("Ambiguous resolution for
visit call to "
@@ -194,8 +194,8 @@
co = r;
}
}
- for (int i = 0; i < ifc.length; i++) {
- Code r = getAppropriateCode_ifc(c, ifc[i]);
+ for (Class anIfc : ifc) {
+ Code r = getAppropriateCode_ifc(c, anIfc);
if (r != null) {
if ((co != null) && (r != co))
throw new RunaboutException("Ambiguous resolution for
visit call to "
@@ -226,8 +226,7 @@
me = this.getClass();
while (me != null) {
Method[] methods = me.getDeclaredMethods();
- for (int i = 0; i < methods.length; i++) {
- Method m = methods[i];
+ for (Method m : methods) {
if ((m.getName().equals("visit"))
&& (!Modifier.isStatic(m.getModifiers()))) {
Class[] args = m.getParameterTypes();
@@ -305,7 +304,7 @@
*
* @param cls the class, may not be primitive
* @return the ovm name, following the convention of
- * <code>java.util.Class.forName</code> according to the JavaDoc
+ * address@hidden java.util.Class.forName} according to the JavaDoc
* specification (JDK 1.2.2/1.3/1.4) which differs from the actual
* implementation in both SUN and IBM VMs.
*/
Added: gnunet-java/src/org/grothoff/package-info.java
===================================================================
--- gnunet-java/src/org/grothoff/package-info.java
(rev 0)
+++ gnunet-java/src/org/grothoff/package-info.java 2012-04-22 15:51:22 UTC
(rev 21068)
@@ -0,0 +1,4 @@
+/**
+ * java implementation of single argument multiple dispatch
+ */
+package org.grothoff;
Modified: gnunet-java/tools/build
===================================================================
--- gnunet-java/tools/build 2012-04-22 14:16:25 UTC (rev 21067)
+++ gnunet-java/tools/build 2012-04-22 15:51:22 UTC (rev 21068)
@@ -17,3 +17,5 @@
# collect resources from src/ and copy to build/
find "." \( -name "*.txt" -o -name "*.properties" \) \
-exec cp --parents '{}' "../build" \;
+
+cd $OLDPWD
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21068 - in gnunet-java: .idea .idea/inspectionProfiles src/org/gnunet/construct src/org/gnunet/construct/parsers src/org/gnunet/core src/org/gnunet/dht src/org/gnunet/nse src/org/gnunet/statistics src/org/gnunet/util src/org/grothoff test/org/gnunet tools,
gnunet <=