GeomConverter/src/org/lcsim/detector/identifier
diff -u -r1.7 -r1.8
--- ExpandedIdentifier.java 28 Aug 2007 22:25:46 -0000 1.7
+++ ExpandedIdentifier.java 25 Sep 2007 23:43:36 -0000 1.8
@@ -7,7 +7,7 @@
* Implementation of {@link IExpandedIdentifier}.
*
* @author Jeremy McCormick
- * @version $Id: ExpandedIdentifier.java,v 1.7 2007/08/28 22:25:46 jeremy Exp $
+ * @version $Id: ExpandedIdentifier.java,v 1.8 2007/09/25 23:43:36 jeremy Exp $
*/
public class ExpandedIdentifier
@@ -18,6 +18,21 @@
public ExpandedIdentifier()
{}
+ public ExpandedIdentifier(IExpandedIdentifier id)
+ {
+ values.addAll(id.getValues());
+ }
+
+ public ExpandedIdentifier(ExpandedIdentifier id)
+ {
+ values.addAll(id.getValues());
+ }
+
+ public ExpandedIdentifier copy()
+ {
+ return new ExpandedIdentifier(this);
+ }
+
public ExpandedIdentifier( int reserve )
{
if (reserve > 64)
GeomConverter/src/org/lcsim/detector/identifier
diff -u -r1.6 -r1.7
--- Identifier.java 28 Aug 2007 03:22:27 -0000 1.6
+++ Identifier.java 25 Sep 2007 23:43:36 -0000 1.7
@@ -1,30 +1,37 @@
-/**
- * File: Identifier.java
- * Created: Apr 30, 2007 4:16:59 PM
- *
- * Implementation of {@link IIdentifier}.
- *
- * @author Jeremy McCormick
- * @version $Id: Identifier.java,v 1.6 2007/08/28 03:22:27 jeremy Exp $
- */
package org.lcsim.detector.identifier;
/**
* Implementation of {@link IIdentifier}.
*
* @author Jeremy McCormick
- * @version $Id: Identifier.java,v 1.6 2007/08/28 03:22:27 jeremy Exp $
+ * @version $Id: Identifier.java,v 1.7 2007/09/25 23:43:36 jeremy Exp $
*/
public class Identifier
implements IIdentifier
{
- long value = unsetValue;
- private static final long unsetValue = 0;
- boolean valid=false;
+ long value;
+ boolean valid = false;
public Identifier()
{}
+ public Identifier(IIdentifier id)
+ {
+ value = id.getValue();
+ valid = id.isValid();
+ }
+
+ public Identifier(Identifier id)
+ {
+ value = id.getValue();
+ valid = id.isValid();
+ }
+
+ public Identifier copy()
+ {
+ return new Identifier(this);
+ }
+
public Identifier(long value)
{
setValue(value);
@@ -48,7 +55,7 @@
public void clear()
{
- value = unsetValue;
+ value = 0;
valid = false;
}