svn commit: r1240468 - in /commons/proper/sanselan/trunk/src: main/java/org/apache/commons/sanselan/common/itu_t4/ main/java/org/apache/commons/sanselan/formats/jpeg/ main/java/org/apache/commons/sans
Author: damjan
Date: Sat Feb 4 09:21:00 2012
New Revision: 1240468
URL: http://svn.apache.org/viewvc?rev=1240468view=rev
Log:
API immutability changes and Java 1.5 updates.
Deleted the unused legacy IptcConstants.IPTC_PREFIX array
(= IPTC_RECORD_TAG_MARKER + IPTC_APPLICATION_2_RECORD_NUMBER).
Converted IptcConstants.IPTC_TYPE_* to an enum.
Made some collections and classes generic.
Similar changes will be applied to the whole tree,
I am just starting here.
Added:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcTypes.java
(with props)
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/itu_t4/HuffmanTree.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegPhotoshopMetadata.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcConstants.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcRecord.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcType.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcTypeLookup.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/JpegIptcRewriter.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/PhotoshopApp13Data.java
commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcDumpTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/itu_t4/HuffmanTree.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/itu_t4/HuffmanTree.java?rev=1240468r1=1240467r2=1240468view=diff
==
---
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/itu_t4/HuffmanTree.java
(original)
+++
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/itu_t4/HuffmanTree.java
Sat Feb 4 09:21:00 2012
@@ -26,7 +26,7 @@ import org.apache.commons.sanselan.commo
* A Huffman tree implemented as 1 array for high locality of reference.
*/
class HuffmanTree {
-private static class Node {
+private final static class Node {
boolean isEmpty = true;
Object value = null;
}
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegPhotoshopMetadata.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegPhotoshopMetadata.java?rev=1240468r1=1240467r2=1240468view=diff
==
---
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegPhotoshopMetadata.java
(original)
+++
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegPhotoshopMetadata.java
Sat Feb 4 09:21:00 2012
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.commons.sanselan.common.ImageMetadata;
import org.apache.commons.sanselan.formats.jpeg.iptc.IptcConstants;
import org.apache.commons.sanselan.formats.jpeg.iptc.IptcRecord;
+import org.apache.commons.sanselan.formats.jpeg.iptc.IptcTypes;
import org.apache.commons.sanselan.formats.jpeg.iptc.PhotoshopApp13Data;
import org.apache.commons.sanselan.util.Debug;
@@ -35,12 +36,12 @@ public class JpegPhotoshopMetadata exten
{
this.photoshopApp13Data = photoshopApp13Data;
-List records = photoshopApp13Data.getRecords();
+ListIptcRecord records = photoshopApp13Data.getRecords();
Collections.sort(records, IptcRecord.COMPARATOR);
for (int j = 0; j records.size(); j++)
{
IptcRecord element = (IptcRecord) records.get(j);
-if (element.iptcType.type != IPTC_TYPE_RECORD_VERSION.type)
+if (element.iptcType != IptcTypes.RECORD_VERSION)
add(element.getIptcTypeName(), element.getValue());
}
}
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcConstants.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcConstants.java?rev=1240468r1=1240467r2=1240468view=diff
==
---
svn commit: r1240483 - in /commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg: iptc/JpegIptcRewriter.java xmp/JpegRewriter.java
Author: damjan
Date: Sat Feb 4 10:34:46 2012
New Revision: 1240483
URL: http://svn.apache.org/viewvc?rev=1240483view=rev
Log:
More conversion to generic types for IPTC classes.
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/JpegIptcRewriter.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/JpegIptcRewriter.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/JpegIptcRewriter.java?rev=1240483r1=1240482r2=1240483view=diff
==
---
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/JpegIptcRewriter.java
(original)
+++
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/JpegIptcRewriter.java
Sat Feb 4 10:34:46 2012
@@ -117,13 +117,13 @@ public class JpegIptcRewriter extends Jp
throws ImageReadException, IOException, ImageWriteException
{
JFIFPieces jfifPieces = analyzeJFIF(byteSource);
-List oldPieces = jfifPieces.pieces;
-List photoshopApp13Segments = findPhotoshopApp13Segments(oldPieces);
+ListJFIFPiece oldPieces = jfifPieces.pieces;
+ListJFIFPiece photoshopApp13Segments =
findPhotoshopApp13Segments(oldPieces);
if (photoshopApp13Segments.size() 1)
throw new ImageReadException(
Image contains more than one Photoshop App13 segment.);
-List newPieces = removePhotoshopApp13Segments(oldPieces);
+ListJFIFPiece newPieces = removePhotoshopApp13Segments(oldPieces);
if (photoshopApp13Segments.size() == 1)
{
JFIFPieceSegment oldSegment = (JFIFPieceSegment)
photoshopApp13Segments
@@ -220,17 +220,17 @@ public class JpegIptcRewriter extends Jp
ImageWriteException
{
JFIFPieces jfifPieces = analyzeJFIF(byteSource);
-List oldPieces = jfifPieces.pieces;
-List photoshopApp13Segments = findPhotoshopApp13Segments(oldPieces);
+ListJFIFPiece oldPieces = jfifPieces.pieces;
+ListJFIFPiece photoshopApp13Segments =
findPhotoshopApp13Segments(oldPieces);
if (photoshopApp13Segments.size() 1)
throw new ImageReadException(
Image contains more than one Photoshop App13 segment.);
-List newPieces = removePhotoshopApp13Segments(oldPieces);
+ListJFIFPiece newPieces = removePhotoshopApp13Segments(oldPieces);
{
// discard old iptc blocks.
-List newBlocks = newData.getNonIptcBlocks();
+ListIptcBlock newBlocks = newData.getNonIptcBlocks();
byte[] newBlockBytes = new IptcParser().writeIPTCBlock(newData
.getRecords());
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java?rev=1240483r1=1240482r2=1240483view=diff
==
---
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
(original)
+++
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
Sat Feb 4 10:34:46 2012
@@ -52,10 +52,10 @@ public class JpegRewriter extends Binary
protected static class JFIFPieces
{
-public final List pieces;
+public final ListJFIFPiece pieces;
public final ListJFIFPiece segmentPieces;
-public JFIFPieces(final List pieces, final ListJFIFPiece
segmentPieces)
+public JFIFPieces(final ListJFIFPiece pieces, final ListJFIFPiece
segmentPieces)
{
this.pieces = pieces;
this.segmentPieces = segmentPieces;
@@ -171,7 +171,7 @@ public class JpegRewriter extends Binary
throws ImageReadException, IOException
// , ImageWriteException
{
-final List pieces = new ArrayList();
+final ListJFIFPiece pieces = new ArrayListJFIFPiece();
final ListJFIFPiece segmentPieces = new ArrayListJFIFPiece();
JpegUtils.Visitor visitor = new JpegUtils.Visitor() {
@@ -232,39 +232,41 @@ public class JpegRewriter extends Binary
}
};
-protected List removeXmpSegments(List segments)
+protected ListJFIFPiece removeXmpSegments(List? extends JFIFPiece
segments)
{
return filterSegments(segments, XMP_SEGMENT_FILTER);
}
-protected List removePhotoshopApp13Segments(List segments)
+protected ListJFIFPiece
svn commit: r1240502 - in /commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg: JpegImageParser.java exif/ExifRewriter.java segments/App2Segment.java xmp/JpegXmpRewrit
Author: damjan
Date: Sat Feb 4 13:50:39 2012
New Revision: 1240502
URL: http://svn.apache.org/viewvc?rev=1240502view=rev
Log:
Added generic collections for all JPEG classes.
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/App2Segment.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpRewriter.java
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java?rev=1240502r1=1240501r2=1240502view=diff
==
---
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
(original)
+++
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
Sat Feb 4 13:50:39 2012
@@ -110,11 +110,11 @@ public class JpegImageParser extends Ima
return false;
}
-public List readSegments(ByteSource byteSource, final int markers[],
+public ListSegment readSegments(ByteSource byteSource, final int
markers[],
final boolean returnAfterFirst, boolean readEverything)
throws ImageReadException, IOException
{
-final List result = new ArrayList();
+final ListSegment result = new ArrayListSegment();
final JpegImageParser parser = this;
final int[] sofnSegments = {
// kJFIFMarker,
@@ -193,7 +193,7 @@ public class JpegImageParser extends Ima
public static final boolean permissive = true;
-private byte[] assembleSegments(List v) throws ImageReadException
+private byte[] assembleSegments(ListApp2Segment v) throws
ImageReadException
{
try
{
@@ -204,13 +204,13 @@ public class JpegImageParser extends Ima
}
}
-private byte[] assembleSegments(List v, boolean start_with_zero)
+private byte[] assembleSegments(ListApp2Segment v, boolean
start_with_zero)
throws ImageReadException
{
if (v.size() 1)
throw new ImageReadException(No App2 Segments Found.);
-int markerCount = ((App2Segment) v.get(0)).num_markers;
+int markerCount = v.get(0).num_markers;
// if (permissive (markerCount == 0))
// markerCount = v.size();
@@ -264,7 +264,7 @@ public class JpegImageParser extends Ima
return result;
}
-private void dumpSegments(List v)
+private void dumpSegments(List? extends Segment v)
{
Debug.debug();
Debug.debug(dumpSegments, v.size());
@@ -279,7 +279,7 @@ public class JpegImageParser extends Ima
Debug.debug();
}
-public List readSegments(ByteSource byteSource, int markers[],
+public ListSegment readSegments(ByteSource byteSource, int markers[],
boolean returnAfterFirst) throws ImageReadException, IOException
{
return readSegments(byteSource, markers, returnAfterFirst, false);
@@ -288,26 +288,25 @@ public class JpegImageParser extends Ima
public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
-List segments = readSegments(byteSource,
+ListSegment segments = readSegments(byteSource,
new int[] { JPEG_APP2_Marker, }, false);
+ListApp2Segment filtered = new ArrayListApp2Segment();
if (segments != null)
{
// throw away non-icc profile app2 segments.
-List filtered = new ArrayList();
for (int i = 0; i segments.size(); i++)
{
App2Segment segment = (App2Segment) segments.get(i);
if (segment.icc_bytes != null)
filtered.add(segment);
}
-segments = filtered;
}
-if ((segments == null) || (segments.size() 1))
+if ((filtered == null) || (filtered.size() 1))
return null;
-byte bytes[] = assembleSegments(segments);
+byte bytes[] = assembleSegments(filtered);
if (debug)
System.out.println(bytes + :
@@ -340,9 +339,9 @@ public class JpegImageParser extends Ima
return byteArrayHasPrefix(segment.bytes, EXIF_IDENTIFIER_CODE);
}
-private List filterAPP1Segments(List v)
+private ListSegment filterAPP1Segments(ListSegment v)
{
-List result = new ArrayList();
+ListSegment result = new ArrayListSegment();
for (int i = 0; i v.size(); i++)
svn commit: r1240506 - /commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPCommand.java
Author: sebb
Date: Sat Feb 4 14:29:19 2012
New Revision: 1240506
URL: http://svn.apache.org/viewvc?rev=1240506view=rev
Log:
Javadoc fix
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPCommand.java
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPCommand.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPCommand.java?rev=1240506r1=1240505r2=1240506view=diff
==
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPCommand.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPCommand.java
Sat Feb 4 14:29:19 2012
@@ -17,7 +17,7 @@
package org.apache.commons.net.ftp;
-/***
+/**
* FTPCommand stores a set of constants for FTP command codes. To interpret
* the meaning of the codes, familiarity with RFC 959 is assumed.
* The mnemonic constant names are transcriptions from the code descriptions
@@ -26,8 +26,8 @@ package org.apache.commons.net.ftp;
* where the constant name is the same as the FTP command.
* p
* p
- ***/
-/** TODO replace this with an enum */
+ */
+// TODO - replace with an enum?
public final class FTPCommand
{
svn commit: r1240508 - /commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Author: sebb Date: Sat Feb 4 14:37:36 2012 New Revision: 1240508 URL: http://svn.apache.org/viewvc?rev=1240508view=rev Log: Javadoc Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=1240508r1=1240507r2=1240508view=diff == --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java Sat Feb 4 14:37:36 2012 @@ -258,7 +258,8 @@ import org.apache.commons.net.io.Util; * and the other xxxFileStream methods * p * - * @author Rory Winston + * @see #FTP_SYSTEM_TYPE + * @see #SYSTEM_TYPE_PROPERTIES * @see FTP * @see FTPConnectionClosedException * @see FTPFileEntryParser
svn commit: r1240513 - in /commons/sandbox/graph/trunk/src: changes/changes.xml test/java/org/apache/commons/graph/connectivity/FindConnectedComponetTestCase.java
Author: simonetripodi
Date: Sat Feb 4 14:58:51 2012
New Revision: 1240513
URL: http://svn.apache.org/viewvc?rev=1240513view=rev
Log:
[SANDBOX-383] Add test for Connectivity - patch provided by Marco Speranza
Modified:
commons/sandbox/graph/trunk/src/changes/changes.xml
commons/sandbox/graph/trunk/src/test/java/org/apache/commons/graph/connectivity/FindConnectedComponetTestCase.java
Modified: commons/sandbox/graph/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/changes/changes.xml?rev=1240513r1=1240512r2=1240513view=diff
==
--- commons/sandbox/graph/trunk/src/changes/changes.xml (original)
+++ commons/sandbox/graph/trunk/src/changes/changes.xml Sat Feb 4 14:58:51 2012
@@ -23,6 +23,9 @@
/properties
body
release version=0.1 date=201?-??-?? description=First release.
+action dev=simonetripodi type=fix issue=SANDBOX-383 due-to=Marco
Speranza
+ Add test for Connectivity
+/action
action dev=simonetripodi type=fix issue=SANDBOX-382 due-to=Marco
Speranza
Add new test for coloring
/action
Modified:
commons/sandbox/graph/trunk/src/test/java/org/apache/commons/graph/connectivity/FindConnectedComponetTestCase.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/test/java/org/apache/commons/graph/connectivity/FindConnectedComponetTestCase.java?rev=1240513r1=1240512r2=1240513view=diff
==
---
commons/sandbox/graph/trunk/src/test/java/org/apache/commons/graph/connectivity/FindConnectedComponetTestCase.java
(original)
+++
commons/sandbox/graph/trunk/src/test/java/org/apache/commons/graph/connectivity/FindConnectedComponetTestCase.java
Sat Feb 4 14:58:51 2012
@@ -21,13 +21,16 @@ package org.apache.commons.graph.connect
import static org.apache.commons.graph.CommonsGraph.findConnectedComponent;
import static org.apache.commons.graph.CommonsGraph.newUndirectedMutableGraph;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import java.util.Collection;
import java.util.List;
+import org.apache.commons.graph.Edge;
+import org.apache.commons.graph.Graph;
+import org.apache.commons.graph.Vertex;
import org.apache.commons.graph.builder.AbstractGraphConnection;
import org.apache.commons.graph.model.BaseLabeledEdge;
import org.apache.commons.graph.model.BaseLabeledVertex;
@@ -39,6 +42,51 @@ import org.junit.Test;
public final class FindConnectedComponetTestCase
{
+
+@Test(expected=NullPointerException.class)
+public void verifyNullGraph()
+{
+findConnectedComponent( (GraphVertex, Edge) null
).includingAllVertices().applyingMinimumSpanningTreeAlgorithm();
+}
+
+@Test
+public void verifyEmptyGraph()
+{
+UndirectedMutableGraphBaseLabeledVertex, BaseLabeledEdge graph =
+newUndirectedMutableGraph( new
AbstractGraphConnectionBaseLabeledVertex, BaseLabeledEdge()
+{
+
+public void connect()
+{
+//empty
+}
+
+} );
+CollectionListBaseLabeledVertex c = findConnectedComponent( graph
).includingAllVertices().applyingMinimumSpanningTreeAlgorithm();
+assertNotNull( c );
+assertEquals( 0, c.size() );
+}
+
+@Test
+public void verifyNullVerticesGraph()
+{
+UndirectedMutableGraphBaseLabeledVertex, BaseLabeledEdge graph =
+newUndirectedMutableGraph( new
AbstractGraphConnectionBaseLabeledVertex, BaseLabeledEdge()
+{
+
+public void connect()
+{
+addVertex( new BaseLabeledVertex( B ) );
+addVertex( new BaseLabeledVertex( C ) );
+}
+
+} );
+CollectionListBaseLabeledVertex c =
+findConnectedComponent( graph
).includingVertices().applyingMinimumSpanningTreeAlgorithm();
+assertNotNull( c );
+assertEquals( 0, c.size() );
+}
+
@Test
public void verifyConnectedComponents()
{
svn commit: r1240515 - in /commons/sandbox/graph/trunk/src: changes/changes.xml test/java/org/apache/commons/graph/flow/FordFulkersonTestCase.java
Author: simonetripodi
Date: Sat Feb 4 15:04:29 2012
New Revision: 1240515
URL: http://svn.apache.org/viewvc?rev=1240515view=rev
Log:
[SANDBOX-384] Add test for Flow Algorithms - patch provided by Marco Speranza
Modified:
commons/sandbox/graph/trunk/src/changes/changes.xml
commons/sandbox/graph/trunk/src/test/java/org/apache/commons/graph/flow/FordFulkersonTestCase.java
Modified: commons/sandbox/graph/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/changes/changes.xml?rev=1240515r1=1240514r2=1240515view=diff
==
--- commons/sandbox/graph/trunk/src/changes/changes.xml (original)
+++ commons/sandbox/graph/trunk/src/changes/changes.xml Sat Feb 4 15:04:29 2012
@@ -23,6 +23,9 @@
/properties
body
release version=0.1 date=201?-??-?? description=First release.
+action dev=simonetripodi type=fix issue=SANDBOX-384 due-to=Marco
Speranza
+ Add test for Flow Algorithms
+/action
action dev=simonetripodi type=fix issue=SANDBOX-383 due-to=Marco
Speranza
Add test for Connectivity
/action
Modified:
commons/sandbox/graph/trunk/src/test/java/org/apache/commons/graph/flow/FordFulkersonTestCase.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/test/java/org/apache/commons/graph/flow/FordFulkersonTestCase.java?rev=1240515r1=1240514r2=1240515view=diff
==
---
commons/sandbox/graph/trunk/src/test/java/org/apache/commons/graph/flow/FordFulkersonTestCase.java
(original)
+++
commons/sandbox/graph/trunk/src/test/java/org/apache/commons/graph/flow/FordFulkersonTestCase.java
Sat Feb 4 15:04:29 2012
@@ -23,6 +23,9 @@ import static org.apache.commons.graph.C
import static
org.apache.commons.graph.CommonsGraph.newDirectedMutableWeightedGraph;
import static org.junit.Assert.assertEquals;
+import org.apache.commons.graph.DirectedGraph;
+import org.apache.commons.graph.Vertex;
+import org.apache.commons.graph.WeightedEdge;
import org.apache.commons.graph.builder.AbstractGraphConnection;
import org.apache.commons.graph.model.BaseLabeledVertex;
import org.apache.commons.graph.model.BaseLabeledWeightedEdge;
@@ -37,6 +40,111 @@ import org.junit.Test;
*/
public final class FordFulkersonTestCase
{
+@Test(expected=NullPointerException.class)
+public void testNullGraph()
+{
+final BaseLabeledVertex a = new BaseLabeledVertex( A );
+final BaseLabeledVertex d = new BaseLabeledVertex( D );
+
+findMaxFlow( (DirectedGraphVertex, WeightedEdgeInteger) null
).from( a ).to( d ).applyingFordFulkerson( new IntegerWeight() );
+}
+
+@Test(expected=NullPointerException.class)
+public void testNullGraphAndVertices()
+{
+findMaxFlow( (DirectedGraphVertex, WeightedEdgeInteger) null
).from( null ).to( null ).applyingFordFulkerson( new IntegerWeight() );
+}
+
+@Test
+public void testNotConnected()
+{
+final BaseLabeledVertex a = new BaseLabeledVertex( A );
+final BaseLabeledVertex d = new BaseLabeledVertex( D );
+
+DirectedMutableWeightedGraphBaseLabeledVertex,
BaseLabeledWeightedEdgeInteger, Integer graph =
+newDirectedMutableWeightedGraph( new
AbstractGraphConnectionBaseLabeledVertex, BaseLabeledWeightedEdgeInteger()
+{
+
+@Override
+public void connect()
+{
+addVertex( a );
+addVertex( new BaseLabeledVertex( B ) );
+addVertex( new BaseLabeledVertex( C ) );
+addVertex( d );
+
+}
+
+} );
+
+// expected max flow
+final Integer expected = 0;
+
+// actual max flow
+Integer actual = findMaxFlow( graph ).from( a ).to( d
).applyingFordFulkerson( new IntegerWeight() );
+
+assertEquals( actual, expected );
+}
+
+@Test
+public void testNotConnected_2()
+{
+final BaseLabeledVertex a = new BaseLabeledVertex( A );
+final BaseLabeledVertex d = new BaseLabeledVertex( D );
+
+DirectedMutableWeightedGraphBaseLabeledVertex,
BaseLabeledWeightedEdgeInteger, Integer graph =
+newDirectedMutableWeightedGraph( new
AbstractGraphConnectionBaseLabeledVertex, BaseLabeledWeightedEdgeInteger()
+{
+
+@Override
+public void connect()
+{
+addVertex( a );
+BaseLabeledVertex b = addVertex( new BaseLabeledVertex( B )
);
+addVertex( new BaseLabeledVertex( C ) );
+addVertex( d );
+addEdge( new BaseLabeledWeightedEdgeInteger( A - B, 1000
) ).from( a ).to( b );
+
+}
+
+} );
+
+// expected max flow
+final Integer expected = 0;
+
+// actual max flow
+Integer actual = findMaxFlow( graph ).from( a ).to( d
svn commit: r1240520 - in /commons/sandbox/graph/trunk/src: changes/ main/java/org/apache/commons/graph/ main/java/org/apache/commons/graph/model/ main/java/org/apache/commons/graph/spanning/
Author: simonetripodi
Date: Sat Feb 4 15:32:05 2012
New Revision: 1240520
URL: http://svn.apache.org/viewvc?rev=1240520view=rev
Log:
[SANDBOX-384] Make Graph components Serializable
Modified:
commons/sandbox/graph/trunk/src/changes/changes.xml
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Edge.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Graph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Vertex.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseGraph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseLabeledEdge.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseLabeledVertex.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseLabeledWeightedEdge.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseMutableGraph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/DirectedMutableGraph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/DirectedMutableWeightedGraph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/InMemoryPath.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/InMemoryWeightedPath.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/MutableSpanningTree.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/RevertedGraph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/UndirectedMutableGraph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/UndirectedMutableWeightedGraph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/spanning/ReverseDeleteGraph.java
Modified: commons/sandbox/graph/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/changes/changes.xml?rev=1240520r1=1240519r2=1240520view=diff
==
--- commons/sandbox/graph/trunk/src/changes/changes.xml (original)
+++ commons/sandbox/graph/trunk/src/changes/changes.xml Sat Feb 4 15:32:05 2012
@@ -23,6 +23,9 @@
/properties
body
release version=0.1 date=201?-??-?? description=First release.
+action dev=simonetripodi type=fix issue=SANDBOX-384
+ Make Graph components Serializable
+/action
action dev=simonetripodi type=fix issue=SANDBOX-384 due-to=Marco
Speranza
Add test for Flow Algorithms
/action
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Edge.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Edge.java?rev=1240520r1=1240519r2=1240520view=diff
==
---
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Edge.java
(original)
+++
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Edge.java
Sat Feb 4 15:32:05 2012
@@ -1,5 +1,7 @@
package org.apache.commons.graph;
+import java.io.Serializable;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -28,6 +30,7 @@ package org.apache.commons.graph;
* intended from {@link #getHead()} to {@link #getTail()}.
*/
public interface Edge
+extends Serializable
{
}
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Graph.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Graph.java?rev=1240520r1=1240519r2=1240520view=diff
==
---
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Graph.java
(original)
+++
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Graph.java
Sat Feb 4 15:32:05 2012
@@ -1,5 +1,7 @@
package org.apache.commons.graph;
+import java.io.Serializable;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,11 +25,12 @@ package org.apache.commons.graph;
* A Graph data structure consists of a finite (and possibly mutable) set of
ordered pairs, called {@link Edge}s or
* arcs, of certain entities called {@link Vertex} or node. As in mathematics,
an {@link Edge} {@code (x,y)} is said to
* point or go from {@code x} to {@code y}.
- *
+ *
* @param V the Graph vertices type
* @param E the Graph edges type
*/
public interface GraphV extends Vertex, E extends Edge
+extends Serializable
{
/**
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Vertex.java
URL:
svn commit: r1240522 - /commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/RevertedGraph.java
Author: simonetripodi
Date: Sat Feb 4 15:34:54 2012
New Revision: 1240522
URL: http://svn.apache.org/viewvc?rev=1240522view=rev
Log:
use shortcuts to check non-null arguments
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/RevertedGraph.java
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/RevertedGraph.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/RevertedGraph.java?rev=1240522r1=1240521r2=1240522view=diff
==
---
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/RevertedGraph.java
(original)
+++
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/RevertedGraph.java
Sat Feb 4 15:34:54 2012
@@ -19,6 +19,8 @@ package org.apache.commons.graph.model;
* under the License.
*/
+import static org.apache.commons.graph.utils.Assertions.checkNotNull;
+
import org.apache.commons.graph.DirectedGraph;
import org.apache.commons.graph.Edge;
import org.apache.commons.graph.Vertex;
@@ -51,11 +53,7 @@ public final class RevertedGraphV exten
*/
public RevertedGraph( DirectedGraphV, E directedGraph )
{
-if ( directedGraph == null )
-{
-throw new IllegalArgumentException( Adapted DirectedGraph must be
not null );
-}
-
+directedGraph = checkNotNull( directedGraph, Adapted DirectedGraph
must be not null );
this.directedGraph = directedGraph;
}
svn commit: r1240523 - /commons/proper/net/trunk/src/site/site.xml
Author: sebb Date: Sat Feb 4 15:37:23 2012 New Revision: 1240523 URL: http://svn.apache.org/viewvc?rev=1240523view=rev Log: Fix missing title for logo Modified: commons/proper/net/trunk/src/site/site.xml Modified: commons/proper/net/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/site/site.xml?rev=1240523r1=1240522r2=1240523view=diff == --- commons/proper/net/trunk/src/site/site.xml (original) +++ commons/proper/net/trunk/src/site/site.xml Sat Feb 4 15:37:23 2012 @@ -15,12 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. -- -project name=Apache Commons Netamp;trade; +project name=Apache Commons Net bannerRight -nameCommons Net#8482;/name +nameApache Commons Net/name src/images/net-logo-white.png/src href/index.html/href +altCommons Netamp;trade; logo/alt /bannerRight body @@ -29,7 +30,7 @@ item name=Migration How-to href=migration.html/ item name=FAQ href=faq.html/ item name=Download href=http://commons.apache.org/net/download_net.cgi/ - item name=Javadoc (3.0.1) href=api-3.0.1/index.html/ + item name=Javadoc (3.1) href=api-3.1/index.html/ item name=Javadoc (1.4.1) href=api-1.4.1/index.html/ item name=Release Notes href=changes-report.html/ /menu
svn commit: r1240528 - /commons/proper/configuration/trunk/src/changes/changes.xml
Author: oheger Date: Sat Feb 4 16:09:58 2012 New Revision: 1240528 URL: http://svn.apache.org/viewvc?rev=1240528view=rev Log: Updated changes.xml for next release. Modified: commons/proper/configuration/trunk/src/changes/changes.xml Modified: commons/proper/configuration/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/changes/changes.xml?rev=1240528r1=1240527r2=1240528view=diff == --- commons/proper/configuration/trunk/src/changes/changes.xml (original) +++ commons/proper/configuration/trunk/src/changes/changes.xml Sat Feb 4 16:09:58 2012 @@ -25,7 +25,11 @@ /properties body -release version=1.8 date=in SVN +release version=1.9 date=in SVN + description=TBD +/release + +release version=1.8 date=2012-02-04 description=Support for Java 1.5 action dev=oheger type=fix issue=CONFIGURATION-476 Fixed possible ClassCastExceptions in CompositeConfiguration related to
svn commit: r1240529 - in /commons/proper/configuration/trunk: build.xml pom.xml
Author: oheger
Date: Sat Feb 4 16:10:32 2012
New Revision: 1240529
URL: http://svn.apache.org/viewvc?rev=1240529view=rev
Log:
Set new development versions.
Modified:
commons/proper/configuration/trunk/build.xml
commons/proper/configuration/trunk/pom.xml
Modified: commons/proper/configuration/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/build.xml?rev=1240529r1=1240528r2=1240529view=diff
==
--- commons/proper/configuration/trunk/build.xml (original)
+++ commons/proper/configuration/trunk/build.xml Sat Feb 4 16:10:32 2012
@@ -22,7 +22,7 @@
property name=component.propfile value=${basedir}/build.properties/
property file=${component.propfile}/
- property name=component.final.name value=commons-configuration-1.8/
+ property name=component.final.name
value=commons-configuration-1.9-SNAPSHOT/
property name=build.dir value=target/
property name=build.classes.dir value=${build.dir}/classes/
property name=src.java.dir value=src/main/java/
Modified: commons/proper/configuration/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/pom.xml?rev=1240529r1=1240528r2=1240529view=diff
==
--- commons/proper/configuration/trunk/pom.xml (original)
+++ commons/proper/configuration/trunk/pom.xml Sat Feb 4 16:10:32 2012
@@ -30,7 +30,7 @@
modelVersion4.0.0/modelVersion
groupIdcommons-configuration/groupId
artifactIdcommons-configuration/artifactId
- version1.8-SNAPSHOT/version
+ version1.9-SNAPSHOT/version
nameCommons Configuration/name
inceptionYear2001/inceptionYear
svn commit: r1240637 - in /commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2: BeanAccessor.java DefaultBeanAccessor.java IndexedPropertyAccessor.java MappedPropertyAccessor.
Author: simonetripodi
Date: Sat Feb 4 23:11:17 2012
New Revision: 1240637
URL: http://svn.apache.org/viewvc?rev=1240637view=rev
Log:
(keyed|mapped) properties need an extra step to specify the index/key
Added:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/IndexedPropertyAccessor.java
(with props)
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/MappedPropertyAccessor.java
(with props)
Modified:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanAccessor.java
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
Modified:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanAccessor.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanAccessor.java?rev=1240637r1=1240636r2=1240637view=diff
==
---
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanAccessor.java
(original)
+++
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanAccessor.java
Sat Feb 4 23:11:17 2012
@@ -31,10 +31,10 @@ public interface BeanAccessorB
BeanAccessor? getProperty( String name )
throws IllegalAccessException, IntrospectionException,
InvocationTargetException, NoSuchMethodException;
-BeanAccessor? getIndexedProperty( String name )
+IndexedPropertyAccessor getIndexedProperty( String name )
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException;
-BeanAccessor? getMappedProperty( String name )
+MappedPropertyAccessor getMappedProperty( String name )
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException;
B get();
Modified:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java?rev=1240637r1=1240636r2=1240637view=diff
==
---
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
(original)
+++
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
Sat Feb 4 23:11:17 2012
@@ -61,14 +61,14 @@ final class DefaultBeanAccessorB
return new DefaultBeanAccessorObject( newBean );
}
-public BeanAccessor? getIndexedProperty( String name )
+public IndexedPropertyAccessor getIndexedProperty( String name )
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException
{
// TODO Auto-generated method stub
return null;
}
-public BeanAccessor? getMappedProperty( String name )
+public MappedPropertyAccessor getMappedProperty( String name )
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException
{
// TODO Auto-generated method stub
Added:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/IndexedPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/IndexedPropertyAccessor.java?rev=1240637view=auto
==
---
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/IndexedPropertyAccessor.java
(added)
+++
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/IndexedPropertyAccessor.java
Sat Feb 4 23:11:17 2012
@@ -0,0 +1,27 @@
+package org.apache.commons.beanutils2;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public interface IndexedPropertyAccessor
+{
+
+BeanAccessor? at( int index );
+
+}
Propchange:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/IndexedPropertyAccessor.java
svn commit: r1240641 - in /commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2: BeanAccessor.java DefaultBeanAccessor.java IndexedPropertySetterAccessor.java MappedPropertySet
Author: simonetripodi
Date: Sat Feb 4 23:24:05 2012
New Revision: 1240641
URL: http://svn.apache.org/viewvc?rev=1240641view=rev
Log:
added chaining interfaces for (keyed|mapped) properties setters
Added:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/IndexedPropertySetterAccessor.java
(with props)
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/MappedPropertySetterAccessor.java
(with props)
Modified:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanAccessor.java
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
Modified:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanAccessor.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanAccessor.java?rev=1240641r1=1240640r2=1240641view=diff
==
---
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanAccessor.java
(original)
+++
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanAccessor.java
Sat Feb 4 23:24:05 2012
@@ -46,6 +46,12 @@ public interface BeanAccessorB
BeanPropertySetterB setProperty( String name )
throws IllegalAccessException, IntrospectionException,
InvocationTargetException, NoSuchMethodException;
+IndexedPropertySetterAccessorB setIndexedProperty( String name )
+throws IllegalAccessException, IntrospectionException,
InvocationTargetException, NoSuchMethodException;
+
+IndexedPropertySetterAccessorB setMappedProperty( String name )
+throws IllegalAccessException, IntrospectionException,
InvocationTargetException, NoSuchMethodException;
+
// clone
B cloneBean()
Modified:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java?rev=1240641r1=1240640r2=1240641view=diff
==
---
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
(original)
+++
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
Sat Feb 4 23:24:05 2012
@@ -102,6 +102,20 @@ final class DefaultBeanAccessorB
return new DefaultBeanPropertySetterB( bean,
propertyDescriptor.getWriteMethod() );
}
+public IndexedPropertySetterAccessorB setIndexedProperty( String name )
+throws IllegalAccessException, IntrospectionException,
InvocationTargetException, NoSuchMethodException
+{
+// TODO
+return null;
+}
+
+public IndexedPropertySetterAccessorB setMappedProperty( String name )
+throws IllegalAccessException, IntrospectionException,
InvocationTargetException, NoSuchMethodException
+{
+// TODO
+return null;
+}
+
public B cloneBean()
throws IllegalAccessException, InstantiationException,
InvocationTargetException, NoSuchMethodException
{
Added:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/IndexedPropertySetterAccessor.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/IndexedPropertySetterAccessor.java?rev=1240641view=auto
==
---
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/IndexedPropertySetterAccessor.java
(added)
+++
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/IndexedPropertySetterAccessor.java
Sat Feb 4 23:24:05 2012
@@ -0,0 +1,27 @@
+package org.apache.commons.beanutils2;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public interface IndexedPropertySetterAccessorB
+{
+
+BeanPropertySetterB at( int index );
+
+}
Propchange:
svn commit: r1240642 - /commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
Author: simonetripodi
Date: Sat Feb 4 23:27:50 2012
New Revision: 1240642
URL: http://svn.apache.org/viewvc?rev=1240642view=rev
Log:
minor comments
Modified:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
Modified:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java?rev=1240642r1=1240641r2=1240642view=diff
==
---
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
(original)
+++
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
Sat Feb 4 23:27:50 2012
@@ -41,6 +41,8 @@ final class DefaultBeanAccessorB
this.bean = bean;
}
+// set
+
/**
* {@inheritDoc}
*/
@@ -61,25 +63,37 @@ final class DefaultBeanAccessorB
return new DefaultBeanAccessorObject( newBean );
}
+/**
+ * {@inheritDoc}
+ */
public IndexedPropertyGetterAccessor getIndexedProperty( String name )
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException
{
-// TODO Auto-generated method stub
+// TODO
return null;
}
+/**
+ * {@inheritDoc}
+ */
public MappedPropertyGetterAccessor getMappedProperty( String name )
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException
{
-// TODO Auto-generated method stub
+// TODO
return null;
}
+/**
+ * {@inheritDoc}
+ */
public B get()
{
return bean;
}
+/**
+ * {@inheritDoc}
+ */
public V V cast()
{
@SuppressWarnings( unchecked )
@@ -87,6 +101,11 @@ final class DefaultBeanAccessorB
return returned;
}
+// set
+
+/**
+ * {@inheritDoc}
+ */
public BeanPropertySetterB setProperty( String name )
throws IllegalAccessException, IntrospectionException,
InvocationTargetException, NoSuchMethodException
{
@@ -102,6 +121,9 @@ final class DefaultBeanAccessorB
return new DefaultBeanPropertySetterB( bean,
propertyDescriptor.getWriteMethod() );
}
+/**
+ * {@inheritDoc}
+ */
public IndexedPropertySetterAccessorB setIndexedProperty( String name )
throws IllegalAccessException, IntrospectionException,
InvocationTargetException, NoSuchMethodException
{
@@ -109,6 +131,9 @@ final class DefaultBeanAccessorB
return null;
}
+/**
+ * {@inheritDoc}
+ */
public IndexedPropertySetterAccessorB setMappedProperty( String name )
throws IllegalAccessException, IntrospectionException,
InvocationTargetException, NoSuchMethodException
{
@@ -116,17 +141,23 @@ final class DefaultBeanAccessorB
return null;
}
+/**
+ * {@inheritDoc}
+ */
public B cloneBean()
throws IllegalAccessException, InstantiationException,
InvocationTargetException, NoSuchMethodException
{
-// TODO Auto-generated method stub
+// TODO
return null;
}
+/**
+ * {@inheritDoc}
+ */
public T extends B void copyPropertiesTo( T target )
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException
{
-// TODO Auto-generated method stub
+// TODO
}
@@ -150,9 +181,12 @@ final class DefaultBeanAccessorB
return result;
}
+/**
+ * {@inheritDoc}
+ */
public void populate( MapString, Object properties )
{
-// TODO Auto-generated method stub
+// TODO
}
/**
svn commit: r1240646 - /commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/PropertyDescriptorsRegistry.java
Author: simonetripodi
Date: Sat Feb 4 23:58:13 2012
New Revision: 1240646
URL: http://svn.apache.org/viewvc?rev=1240646view=rev
Log:
this class is a singleton, methods registry is a singleton, no needs to have
the methods registry as a class member
Modified:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/PropertyDescriptorsRegistry.java
Modified:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/PropertyDescriptorsRegistry.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/PropertyDescriptorsRegistry.java?rev=1240646r1=1240645r2=1240646view=diff
==
---
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/PropertyDescriptorsRegistry.java
(original)
+++
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/PropertyDescriptorsRegistry.java
Sat Feb 4 23:58:13 2012
@@ -40,8 +40,6 @@ import java.util.concurrent.locks.Reentr
final class PropertyDescriptorsRegistry
{
-private static final AccessibleObjectsRegistryMethod METHODS_REGISTRY =
AccessibleObjectsRegistry.getMethodsRegistry();
-
private static final PropertyDescriptorsRegistry INSTANCE = new
PropertyDescriptorsRegistry();
public static PropertyDescriptorsRegistry getInstance()
@@ -49,6 +47,8 @@ final class PropertyDescriptorsRegistry
return INSTANCE;
}
+private final AccessibleObjectsRegistryMethod methodsRegistry =
AccessibleObjectsRegistry.getMethodsRegistry();
+
private final ReadWriteLock lock = new ReentrantReadWriteLock();
private final MapClass?, WeakReferenceMapString,
PropertyDescriptor cache =
@@ -103,7 +103,7 @@ final class PropertyDescriptorsRegistry
}
}
-private static void makeMethodsAccessible( Class? beanType,
PropertyDescriptor propertyDescriptor )
+private void makeMethodsAccessible( Class? beanType, PropertyDescriptor
propertyDescriptor )
throws IntrospectionException
{
// we need to make sure that methods are accessible for anonymous types
@@ -111,13 +111,13 @@ final class PropertyDescriptorsRegistry
if ( propertyDescriptor.getReadMethod() != null )
{
Method readMethod = propertyDescriptor.getReadMethod();
-readMethod = METHODS_REGISTRY.get( true, beanType,
readMethod.getName() );
+readMethod = methodsRegistry.get( true, beanType,
readMethod.getName() );
propertyDescriptor.setReadMethod( readMethod );
}
if ( propertyDescriptor.getWriteMethod() != null )
{
Method writeMethod = propertyDescriptor.getWriteMethod();
-writeMethod = METHODS_REGISTRY.get( true, beanType,
writeMethod.getName(), writeMethod.getParameterTypes() );
+writeMethod = methodsRegistry.get( true, beanType,
writeMethod.getName(), writeMethod.getParameterTypes() );
propertyDescriptor.setWriteMethod( writeMethod );
}
}
svn commit: r1240648 - /commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/PropertyDescriptorsRegistry.java
Author: simonetripodi
Date: Sun Feb 5 00:03:32 2012
New Revision: 1240648
URL: http://svn.apache.org/viewvc?rev=1240648view=rev
Log:
one locking level is more than enough
Modified:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/PropertyDescriptorsRegistry.java
Modified:
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/PropertyDescriptorsRegistry.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/PropertyDescriptorsRegistry.java?rev=1240648r1=1240647r2=1240648view=diff
==
---
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/PropertyDescriptorsRegistry.java
(original)
+++
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/PropertyDescriptorsRegistry.java
Sun Feb 5 00:03:32 2012
@@ -31,8 +31,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.WeakHashMap;
import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.ReentrantLock;
/**
*
@@ -49,8 +48,6 @@ final class PropertyDescriptorsRegistry
private final AccessibleObjectsRegistryMethod methodsRegistry =
AccessibleObjectsRegistry.getMethodsRegistry();
-private final ReadWriteLock lock = new ReentrantReadWriteLock();
-
private final MapClass?, WeakReferenceMapString,
PropertyDescriptor cache =
new WeakHashMapClass?, WeakReferenceMapString,
PropertyDescriptor();
@@ -65,8 +62,8 @@ final class PropertyDescriptorsRegistry
public MapString, PropertyDescriptor getPropertiesIndex( Class?
beanType )
throws IntrospectionException
{
-Lock readLock = lock.readLock();
-readLock.lock();
+final Lock lock = new ReentrantLock();
+lock.lock();
try
{
ReferenceMapString, PropertyDescriptor methodReference =
cache.get( beanType );
@@ -74,16 +71,7 @@ final class PropertyDescriptorsRegistry
{
return methodReference.get();
}
-}
-finally
-{
-readLock.unlock();
-}
-Lock writeLock = lock.writeLock();
-writeLock.lock();
-try
-{
final MapString, PropertyDescriptor propertiesIndex = new
HashMapString, PropertyDescriptor();
BeanInfo beanInfo = getBeanInfo( beanType );
@@ -99,7 +87,7 @@ final class PropertyDescriptorsRegistry
}
finally
{
-writeLock.unlock();
+lock.unlock();
}
}
svn commit: r1240671 - in /commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan: formats/jpeg/ formats/jpeg/exif/ formats/jpeg/iptc/ formats/jpeg/xmp/ formats/png/ formats/tiff/ for
Author: damjan
Date: Sun Feb 5 07:47:22 2012
New Revision: 1240671
URL: http://svn.apache.org/viewvc?rev=1240671view=rev
Log:
Converted most collections to use generics,
converted all Comparable and Comparator instances to use generics,
and dropped most casts.
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngWriter.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffContents.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffElement.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossy.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/ColorSpaceSubset.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/Debug.java
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java?rev=1240671r1=1240670r2=1240671view=diff
==
---
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java
(original)
+++
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java
Sun Feb 5 07:47:22 2012
@@ -93,7 +93,7 @@ public class JpegImageMetadata implement
* @throws IOException
*/
public byte[] getEXIFThumbnailData() throws ImageReadException,
IOException {
-List dirs = exif.getDirectories();
+List? extends IImageMetadataItem dirs = exif.getDirectories();
for (int i = 0; i dirs.size(); i++) {
TiffImageMetadata.Directory dir = (TiffImageMetadata.Directory)
dirs
.get(i);
@@ -126,7 +126,7 @@ public class JpegImageMetadata implement
return null;
}
-List dirs = exif.getDirectories();
+List? extends IImageMetadataItem dirs = exif.getDirectories();
for (int i = 0; i dirs.size(); i++) {
TiffImageMetadata.Directory dir = (TiffImageMetadata.Directory)
dirs
.get(i);
@@ -151,7 +151,7 @@ public class JpegImageMetadata implement
}
public TiffImageData getRawImageData() {
-List dirs = exif.getDirectories();
+List? extends IImageMetadataItem dirs = exif.getDirectories();
for (int i = 0; i dirs.size(); i++) {
TiffImageMetadata.Directory dir = (TiffImageMetadata.Directory)
dirs
.get(i);
@@ -164,8 +164,8 @@ public class JpegImageMetadata implement
return null;
}
-public List getItems() {
-ListObject result = new ArrayListObject();
+public ListIImageMetadataItem getItems() {
+ListIImageMetadataItem result = new ArrayListIImageMetadataItem();
if (null != exif)
result.addAll(exif.getItems());
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java?rev=1240671r1=1240670r2=1240671view=diff
==
---
