[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19237 - in gnunet-java: .idea src/org/gnunet/util src/org/
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r19237 - in gnunet-java: .idea src/org/gnunet/util src/org/gnunet/util/getopt |
|
Date: |
Wed, 18 Jan 2012 14:08:02 +0100 |
Author: dold
Date: 2012-01-18 14:08:02 +0100 (Wed, 18 Jan 2012)
New Revision: 19237
Added:
gnunet-java/src/org/gnunet/util/getopt/Option.java
Removed:
gnunet-java/src/org/gnunet/util/getopt/Parameter.java
Modified:
gnunet-java/.idea/workspace.xml
gnunet-java/src/org/gnunet/util/Program.java
gnunet-java/src/org/gnunet/util/getopt/Parser.java
Log:
fix
Modified: gnunet-java/.idea/workspace.xml
===================================================================
--- gnunet-java/.idea/workspace.xml 2012-01-18 12:59:56 UTC (rev 19236)
+++ gnunet-java/.idea/workspace.xml 2012-01-18 13:08:02 UTC (rev 19237)
@@ -1,48 +1,11 @@
<?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="rudimentary
version of resolve tool completed">
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/util/getopt" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/resolver" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/TaggedUnion.java" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/service/Resolver.java" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/util/getopt/Argument.java" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/util/getopt/Parameter.java" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/src/org/gnunet/util/getopt/Parser.java" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/test/org/gnunet/construct/ByteFillMessage.java" />
- <change type="DELETED"
beforePath="$PROJECT_DIR$/src/org/gnunet/service/NSE_StartMessage.java"
afterPath="" />
- <change type="DELETED"
beforePath="$PROJECT_DIR$/src/org/gnunet/service/NSE_UpdateMessage.java"
afterPath="" />
- <change type="DELETED"
beforePath="$PROJECT_DIR$/lib/slf4j-jdk14-1.6.4.jar" afterPath="" />
- <change type="MOVED"
beforePath="$PROJECT_DIR$/src/org/gnunet/service/NetworkSizeEstimationService.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/service/NetworkSizeEstimation.java" />
- <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/misc.xml"
afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+ <list default="true" readonly="true"
id="b4faf44d-8919-474e-bfab-5900bc40cc2b" name="Default" comment="">
+ <change type="MOVED"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/getopt/Parameter.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/getopt/Option.java" />
<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$/gnunet-java.eml"
afterPath="$PROJECT_DIR$/gnunet-java.eml" />
- <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/MessageIdAnnotationProcessor.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/MessageIdAnnotationProcessor.java"
/>
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/MessageLoader.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/MessageLoader.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/construct/Nested.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/Nested.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/ZeroTerminatedString.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/ZeroTerminatedString.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/ByteFillParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/ByteFillParser.java"
/>
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/DoubleParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/DoubleParser.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/FillParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/FillParser.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/FixedSizeArrayParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/FixedSizeArrayParser.java"
/>
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/IntegerParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/IntegerParser.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/NestedParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/NestedParser.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/construct/parsers/SequenceParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/SequenceParser.java"
/>
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/StringParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/StringParser.java" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/VariableSizeArrayParser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/construct/parsers/VariableSizeArrayParser.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/Scheduler.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/Scheduler.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/NetworkSizeEstimationServiceTest.java"
afterPath="$PROJECT_DIR$/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java"
/>
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/update-msgtypes.sh"
afterPath="$PROJECT_DIR$/update-msgtypes.sh" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/org/gnunet/util/getopt/Parser.java"
afterPath="$PROJECT_DIR$/src/org/gnunet/util/getopt/Parser.java" />
</list>
<ignored path="gnunet-java.iws" />
<ignored path=".idea/workspace.xml" />
@@ -100,26 +63,6 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="Resolver.java" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/service/Resolver.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="155" column="12" selection-start="4980"
selection-end="4980" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="e#543#599#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ISSUES" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/ISSUES">
- <provider selected="true" editor-type-id="text-editor">
- <state line="154" column="41" selection-start="5164"
selection-end="5164" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
<file leaf-file-name="Construct.java" pinned="false" current="false"
current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/Construct.java">
<provider selected="true" editor-type-id="text-editor">
@@ -132,8 +75,11 @@
<file leaf-file-name="Parser.java" pinned="false" current="true"
current-in-tab="true">
<entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/getopt/Parser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="22" selection-start="700"
selection-end="700" vertical-scroll-proportion="0.46011397">
- <folding />
+ <state line="75" column="71" selection-start="2181"
selection-end="2181" vertical-scroll-proportion="0.5641026">
+ <folding>
+ <element signature="e#1206#1221#0" expanded="true" />
+ <element signature="e#1283#1296#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -141,7 +87,7 @@
<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="28" column="10" selection-start="792"
selection-end="792" vertical-scroll-proportion="0.0">
+ <state line="31" column="8" selection-start="874"
selection-end="874" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -186,12 +132,30 @@
<file leaf-file-name="NestedParser.java" pinned="false" current="false"
current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/NestedParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="39" column="23" selection-start="1133"
selection-end="1133" vertical-scroll-proportion="0.0">
+ <state line="46" column="25" selection-start="1441"
selection-end="1441" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="Option.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/getopt/Option.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="13" column="27" selection-start="374"
selection-end="374" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Argument.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/getopt/Argument.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="11" column="15" selection-start="303"
selection-end="303" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -202,8 +166,6 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/src/org/gnunet/util/Client.java" />
- <option value="$PROJECT_DIR$/src/org/gnunet/construct/Optional.java" />
<option value="$PROJECT_DIR$/src/org/gnunet/construct/Nested.java" />
<option
value="$PROJECT_DIR$/src/org/gnunet/construct/parsers/Parser.java" />
<option
value="$PROJECT_DIR$/src/org/gnunet/construct/parsers/SequenceParser.java" />
@@ -216,6 +178,8 @@
<option value="$PROJECT_DIR$/src/org/gnunet/util/getopt/Argument.java"
/>
<option value="$PROJECT_DIR$/src/org/gnunet/service/Resolver.java" />
<option value="$PROJECT_DIR$/ISSUES" />
+ <option
value="$PROJECT_DIR$/src/org/gnunet/util/getopt/Parameter.java" />
+ <option value="$PROJECT_DIR$/src/org/gnunet/util/getopt/Option.java" />
<option value="$PROJECT_DIR$/src/org/gnunet/util/Program.java" />
<option value="$PROJECT_DIR$/src/org/gnunet/util/getopt/Parser.java" />
</list>
@@ -745,16 +709,16 @@
<property name="GenerateAntBuildDialog.inclineRuntiemClasspath"
value="true" />
<property name="GenerateAntBuildDialog.forceTargetJdk" value="false" />
<property name="project.structure.side.proportion" value="0.2" />
- <property name="GenerateAntBuildDialog.outputFileNameProperty"
value="gnunet-java" />
<property name="MemberChooser.copyJavadoc" value="false" />
+ <property name="GenerateAntBuildDialog.outputFileNameProperty"
value="gnunet-java" />
<property name="GenerateAntBuildDialog.enableUiFormCompile" value="false"
/>
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
<property name="MemberChooser.showClasses" value="true" />
- <property name="GenerateAntBuildDialog.backupFiles" value="false" />
<property name="GoToClass.includeLibraries" value="false" />
- <property name="dynamic.classpath" value="false" />
- <property name="options.splitter.details.proportions" value="0.2" />
+ <property name="GenerateAntBuildDialog.backupFiles" value="false" />
<property name="options.searchVisible" value="true" />
+ <property name="options.splitter.details.proportions" value="0.2" />
+ <property name="dynamic.classpath" value="false" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
@@ -1013,15 +977,15 @@
</component>
<component name="ToolWindowManager">
<frame x="-6" y="17" width="1452" height="889" extended-state="0" />
- <editor active="false" />
+ <editor active="true" />
<layout>
- <window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.119505495" sideWeight="0.49713057" 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.2967033" sideWeight="0.49713057" 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="true" anchor="left" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24819624"
sideWeight="0.88049453" order="0" 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.21933623"
sideWeight="0.7032967" 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" />
@@ -1070,7 +1034,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="added libs" />
+ <option name="LAST_COMMIT_MESSAGE" value="rudimentary version of resolve
tool completed" />
<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" />
@@ -1088,6 +1052,7 @@
<MESSAGE value="fixes / documentation" />
<MESSAGE value="fix" />
<MESSAGE value="added libs" />
+ <MESSAGE value="rudimentary version of resolve tool completed" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -1097,11 +1062,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/Parser.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="23" column="41" selection-start="540" selection-end="540"
vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
<entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/SequenceParser.java">
<provider selected="true" editor-type-id="text-editor">
<state line="39" column="20" selection-start="1014"
selection-end="1014" vertical-scroll-proportion="0.0" />
@@ -1122,11 +1082,21 @@
<state line="17" column="4" selection-start="397" selection-end="397"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/getopt/Argument.java">
+ <entry file="file://$PROJECT_DIR$/ISSUES">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="15" selection-start="303" selection-end="303"
vertical-scroll-proportion="0.0" />
+ <state line="151" column="10" selection-start="4917"
selection-end="4917" vertical-scroll-proportion="0.43251088" />
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/service/Resolver.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="155" column="12" selection-start="4980"
selection-end="4980" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/construct/Construct.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="68" column="1" selection-start="2022"
selection-end="2449" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/log4j.properties">
<provider selected="true" editor-type-id="text-editor">
<state line="2" column="50" selection-start="78" selection-end="78"
vertical-scroll-proportion="0.0" />
@@ -1149,43 +1119,37 @@
</entry>
<entry
file="file://$PROJECT_DIR$/src/org/gnunet/construct/parsers/NestedParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="39" column="23" selection-start="1133"
selection-end="1133" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/service/Resolver.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="155" column="12" selection-start="4980"
selection-end="4980" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="e#543#599#0" expanded="true" />
- </folding>
+ <state line="46" column="25" selection-start="1441"
selection-end="1441" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/ISSUES">
+ <entry
file="file://$PROJECT_DIR$/src/org/gnunet/util/getopt/Argument.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="154" column="41" selection-start="5164"
selection-end="5164" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="11" column="15" selection-start="303" selection-end="303"
vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/gnunet/construct/Construct.java">
+ <entry file="file://$PROJECT_DIR$/src/org/gnunet/util/getopt/Option.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="68" column="1" selection-start="2022"
selection-end="2449" vertical-scroll-proportion="0.0">
+ <state line="13" column="27" selection-start="374" selection-end="374"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/org/gnunet/util/Program.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="10" selection-start="792" selection-end="792"
vertical-scroll-proportion="0.0">
+ <state line="31" column="8" selection-start="874" selection-end="874"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/org/gnunet/util/getopt/Parser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="22" selection-start="700" selection-end="700"
vertical-scroll-proportion="0.46011397">
- <folding />
+ <state line="75" column="71" selection-start="2181"
selection-end="2181" vertical-scroll-proportion="0.5641026">
+ <folding>
+ <element signature="e#1206#1221#0" expanded="true" />
+ <element signature="e#1283#1296#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
Modified: gnunet-java/src/org/gnunet/util/Program.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Program.java 2012-01-18 12:59:56 UTC
(rev 19236)
+++ gnunet-java/src/org/gnunet/util/Program.java 2012-01-18 13:08:02 UTC
(rev 19237)
@@ -1,7 +1,7 @@
package org.gnunet.util;
import org.gnunet.service.Resolver;
-import org.gnunet.util.getopt.Parameter;
+import org.gnunet.util.getopt.Option;
import org.gnunet.util.getopt.Parser;
public abstract class Program {
@@ -10,7 +10,9 @@
- @Parameter(names = {"-c", "--config"}, description = "Path of the
configuration file")
+ @Option(shortname = "c", longname = "config",
+ description = "Path of the configuration file",
+ action ="store-string")
public String cfgFileName;
Copied: gnunet-java/src/org/gnunet/util/getopt/Option.java (from rev 19221,
gnunet-java/src/org/gnunet/util/getopt/Parameter.java)
===================================================================
--- gnunet-java/src/org/gnunet/util/getopt/Option.java
(rev 0)
+++ gnunet-java/src/org/gnunet/util/getopt/Option.java 2012-01-18 13:08:02 UTC
(rev 19237)
@@ -0,0 +1,16 @@
+package org.gnunet.util.getopt;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
address@hidden(RetentionPolicy.RUNTIME)
address@hidden(ElementType.FIELD)
+public @interface Option {
+ public String shortname();
+ public String longname();
+ public String action();
+ public String description();
+}
Deleted: gnunet-java/src/org/gnunet/util/getopt/Parameter.java
===================================================================
--- gnunet-java/src/org/gnunet/util/getopt/Parameter.java 2012-01-18
12:59:56 UTC (rev 19236)
+++ gnunet-java/src/org/gnunet/util/getopt/Parameter.java 2012-01-18
13:08:02 UTC (rev 19237)
@@ -1,14 +0,0 @@
-package org.gnunet.util.getopt;
-
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
address@hidden(RetentionPolicy.RUNTIME)
address@hidden(ElementType.FIELD)
-public @interface Parameter {
- public String[] names();
- public String[] description();
-}
Modified: gnunet-java/src/org/gnunet/util/getopt/Parser.java
===================================================================
--- gnunet-java/src/org/gnunet/util/getopt/Parser.java 2012-01-18 12:59:56 UTC
(rev 19236)
+++ gnunet-java/src/org/gnunet/util/getopt/Parser.java 2012-01-18 13:08:02 UTC
(rev 19237)
@@ -8,13 +8,34 @@
public class Parser {
-
+
public static class ArgumentError extends RuntimeException {
public ArgumentError(String s) {
super(s);
}
}
+
+ static class OptionField {
+ Option opt;
+ Field f;
+
+ public OptionField(Option opt, Field f) {
+ this.opt = opt;
+ this.f = f;
+ }
+ }
+
+ static class ArgumentField {
+ Argument arg;
+ Field f;
+
+ public ArgumentField(Argument arg, Field f) {
+ this.arg = arg;
+ this.f = f;
+ }
+ }
+
// todo: unify with Construct.getMessageFields
private static List<Field> getFields(Class c) {
LinkedList<Field> fields = new
LinkedList<Field>(Arrays.asList(c.getDeclaredFields()));
@@ -23,15 +44,55 @@
}
return fields;
}
-
+
public static void parse(Object o, String[] args) {
- LinkedList<String> posArgs = new LinkedList(Arrays.asList(args));
+
+ LinkedList<ArgumentField> argFields = new LinkedList<ArgumentField>();
+ LinkedList<OptionField> optFields = new LinkedList<OptionField>();
+
for (Field f : getFields(o.getClass())) {
if (f.isSynthetic() || Modifier.isStatic(f.getModifiers())) {
continue;
}
Argument a = f.getAnnotation(Argument.class);
if (a != null) {
+ argFields.add(new ArgumentField(a, f));
+ }
+ // todo: validity checking of annotations
+ Option opt = f.getAnnotation(Option.class);
+ if (opt != null) {
+ optFields.add(new OptionField(opt, f));
+ }
+ }
+ LinkedList<String> posArgs = new LinkedList();
+
+ int p = 0;
+
+ while (p < args.length) {
+ if (args[p].equals("--")) {
+ throw new UnsupportedOperationException();
+ }
+ if (args[p].startsWith("--")) {
+ throw new UnsupportedOperationException("long option");
+ }
+ if (args[p].startsWith("-")) {
+ // option
+ throw new UnsupportedOperationException("short option");
+ }
+
+ // [...]
+
+ posArgs.add(args[p]);
+
+ p++;
+ }
+
+ for (Field f : getFields(o.getClass())) {
+ if (f.isSynthetic() || Modifier.isStatic(f.getModifiers())) {
+ continue;
+ }
+ Argument a = f.getAnnotation(Argument.class);
+ if (a != null) {
if (posArgs.isEmpty()) {
throw new ArgumentError("argument " + a.name() + "
missing");
}
@@ -52,31 +113,6 @@
throw new ArgumentError("too many arguments");
}
-
-/*
- HashMap<String, ParserAction> longMap;
- HashMap<String, ParserAction> shortMap;
- Field restField;
- for (Field f : Construct.getF) {
- f.getAnnotation()
- }
-
-
- int p = 0;
- while (p < args.length) {
- if (args[p].equals("--")) {
- // handle rest args
- // TODO ...
- } else if (args[p].startsWith("--")) {
-
- } else if (args[0].startsWith("-")) {
-
- } else {
- // positional / rest arg
- }
- p++;
- }
- */
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19237 - in gnunet-java: .idea src/org/gnunet/util src/org/gnunet/util/getopt,
gnunet <=