Author: jm
Date: 2013-01-23 20:23:13 -0800 (Wed, 23 Jan 2013)
New Revision: 31081
Modified:
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/SUIDToEdgeMapper.java
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/SUIDToNodeMapper.java
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/Degree.java
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/InDegree.java
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/OutDegree.java
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/TargetID.java
Log:
References #1684: Fixed files that didn't patch cleanly the first time around
Modified:
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/SUIDToEdgeMapper.java
===================================================================
---
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/SUIDToEdgeMapper.java
2013-01-24 04:22:32 UTC (rev 31080)
+++
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/SUIDToEdgeMapper.java
2013-01-24 04:23:13 UTC (rev 31081)
@@ -1,6 +1,30 @@
package org.cytoscape.equations.internal;
+/*
+ * #%L
+ * Cytoscape Equation Functions Impl (equations-functions-impl)
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2010 - 2013 The Cytoscape Consortium
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+
import java.util.HashMap;
import java.util.Map;
Modified:
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/SUIDToNodeMapper.java
===================================================================
---
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/SUIDToNodeMapper.java
2013-01-24 04:22:32 UTC (rev 31080)
+++
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/SUIDToNodeMapper.java
2013-01-24 04:23:13 UTC (rev 31081)
@@ -1,6 +1,30 @@
package org.cytoscape.equations.internal;
+/*
+ * #%L
+ * Cytoscape Equation Functions Impl (equations-functions-impl)
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2010 - 2013 The Cytoscape Consortium
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+
import java.util.HashMap;
import java.util.Map;
Modified:
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/Degree.java
===================================================================
---
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/Degree.java
2013-01-24 04:22:32 UTC (rev 31080)
+++
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/Degree.java
2013-01-24 04:23:13 UTC (rev 31081)
@@ -1,35 +1,30 @@
-/*
- File: Degree.java
-
- Copyright (c) 2010, The Cytoscape Consortium (www.cytoscape.org)
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
package org.cytoscape.equations.internal.functions;
+/*
+ * #%L
+ * Cytoscape Equation Functions Impl (equations-functions-impl)
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2010 - 2013 The Cytoscape Consortium
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+
import java.util.ArrayList;
import java.util.List;
Modified:
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/InDegree.java
===================================================================
---
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/InDegree.java
2013-01-24 04:22:32 UTC (rev 31080)
+++
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/InDegree.java
2013-01-24 04:23:13 UTC (rev 31081)
@@ -1,35 +1,30 @@
-/*
- File: InDegree.java
-
- Copyright (c) 2010, The Cytoscape Consortium (www.cytoscape.org)
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
package org.cytoscape.equations.internal.functions;
+/*
+ * #%L
+ * Cytoscape Equation Functions Impl (equations-functions-impl)
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2010 - 2013 The Cytoscape Consortium
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
Modified:
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/OutDegree.java
===================================================================
---
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/OutDegree.java
2013-01-24 04:22:32 UTC (rev 31080)
+++
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/OutDegree.java
2013-01-24 04:23:13 UTC (rev 31081)
@@ -1,35 +1,30 @@
-/*
- File: OutDegree.java
-
- Copyright (c) 2010, The Cytoscape Consortium (www.cytoscape.org)
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
package org.cytoscape.equations.internal.functions;
+/*
+ * #%L
+ * Cytoscape Equation Functions Impl (equations-functions-impl)
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2010 - 2013 The Cytoscape Consortium
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
Modified:
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/TargetID.java
===================================================================
---
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/TargetID.java
2013-01-24 04:22:32 UTC (rev 31080)
+++
core3/impl/branches/3.0.0-release/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/functions/TargetID.java
2013-01-24 04:23:13 UTC (rev 31081)
@@ -1,35 +1,30 @@
-/*
- File: TargetID.java
-
- Copyright (c) 2010, The Cytoscape Consortium (www.cytoscape.org)
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
package org.cytoscape.equations.internal.functions;
+/*
+ * #%L
+ * Cytoscape Equation Functions Impl (equations-functions-impl)
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2010 - 2013 The Cytoscape Consortium
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+
import org.cytoscape.equations.AbstractFunction;
import org.cytoscape.equations.ArgDescriptor;
import org.cytoscape.equations.ArgType;
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
Visit this group at http://groups.google.com/group/cytoscape-cvs?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.
