Author: tdraier
Date: Mon Jun 25 16:03:19 2007
New Revision: 17771
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17771&repname=
=3Djahia
Log:
restore class versionUID ( backport 17696 )
Modified:
trunk/core/src/java/org/jahia/content/NodeOperationResult.java
trunk/core/src/java/org/jahia/services/importexport/ImportResult.java
trunk/core/src/java/org/jahia/services/version/ActivationTestResults.ja=
va
trunk/core/src/java/org/jahia/services/version/IsValidForActivationResu=
lts.java
trunk/core/src/java/org/jahia/services/version/RestoreVersionNodeTestRe=
sult.java
trunk/core/src/java/org/jahia/services/version/RestoreVersionTestResult=
s.java
Modified: trunk/core/src/java/org/jahia/content/NodeOperationResult.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/content/NodeOperationResult.java&rev=3D17771&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/content/NodeOperationResult.java (origina=
l)
+++ trunk/core/src/java/org/jahia/content/NodeOperationResult.java Mon Jun =
25 16:03:19 2007
@@ -1,20 +1,21 @@
/*
* Copyright 2002-2006 Jahia Ltd
*
- * Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (J=
CDDL), =
- * Version 1.0 (the "License"), or (at your option) any later version; you=
may =
- * not use this file except in compliance with the License. You should hav=
e =
- * received a copy of the License along with this program; if not, you may=
obtain =
- * a copy of the License at =
+ * Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (J=
CDDL),
+ * Version 1.0 (the "License"), or (at your option) any later version; you=
may
+ * not use this file except in compliance with the License. You should have
+ * received a copy of the License along with this program; if not, you may=
obtain
+ * a copy of the License at
*
* http://www.jahia.org/license/
*
- * 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 =
+ * 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.
- */package org.jahia.content;
+ */
+package org.jahia.content;
=
import org.jahia.engines.EngineMessage;
=
@@ -27,6 +28,7 @@
* child class), that describes a specific result for a node.</p>
* <p>Copyright: Copyright (c) 2002</p>
* <p>Company: </p>
+ *
* @author Serge Huber
* @version 1.0
*/
@@ -34,30 +36,34 @@
public class NodeOperationResult implements Serializable {
private static final long serialVersionUID =3D 1L;
=
- private ObjectKey nodeKey;
- private String languageCode;
- private String comment;
+ protected ObjectKey nodeKey;
+ protected String languageCode;
+ protected String comment;
protected EngineMessage msg;
=
/**
* Constructor for the result.
- * @param nodeKey a valid ObjectKey instance that represents the node =
for
- * which we are creating the result.
+ *
+ * @param nodeKey a valid ObjectKey instance that represents the =
node for
+ * which we are creating the result.
* @param languageCode the language for which this result is given
- * @param comment the text describing the result, or a resource bundle=
key
- * to use for internationalization.
- * recognized by Jahia
- * @see org.jahia.content.ObjectKey
+ * @param comment the text describing the result, or a resource b=
undle key
+ * to use for internationalization.
+ * recognized by Jahia
+ * @see ObjectKey
*/
- public NodeOperationResult (ObjectKey nodeKey, String languageCode,
- String comment) {
+ public NodeOperationResult(final ObjectKey nodeKey,
+ final String languageCode,
+ final String comment) {
this.nodeKey =3D nodeKey;
this.languageCode =3D languageCode;
this.comment =3D comment;
}
=
- public NodeOperationResult (ObjectKey nodeKey, String languageCode,
- String comment, EngineMessage msg) {
+ public NodeOperationResult(final ObjectKey nodeKey,
+ final String languageCode,
+ final String comment,
+ final EngineMessage msg) {
this.nodeKey =3D nodeKey;
this.languageCode =3D languageCode;
this.comment =3D comment;
@@ -67,9 +73,11 @@
public ObjectKey getNodeKey() {
return nodeKey;
}
+
public String getLanguageCode() {
return languageCode;
}
+
public String getComment() {
return comment;
}
@@ -77,4 +85,12 @@
public EngineMessage getMsg() {
return msg;
}
+
+ public String getObjectType() {
+ return getNodeKey().getType();
+ }
+
+ public int getObjectID() {
+ return Integer.parseInt(getNodeKey().getIDInType());
+ }
}
\ No newline at end of file
Modified: trunk/core/src/java/org/jahia/services/importexport/ImportResult.=
java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/ImportResult.java&rev=3D17771&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/importexport/ImportResult.java (=
original)
+++ trunk/core/src/java/org/jahia/services/importexport/ImportResult.java M=
on Jun 25 16:03:19 2007
@@ -26,6 +26,8 @@
* @version $Id$
*/
public class ImportResult extends TreeOperationResult {
+ private static final long serialVersionUID =3D -5987706993483879944L;
+
public ImportResult() {
}
=
Modified: trunk/core/src/java/org/jahia/services/version/ActivationTestResu=
lts.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/version/ActivationTestResults.java&rev=3D17771&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/version/ActivationTestResults.ja=
va (original)
+++ trunk/core/src/java/org/jahia/services/version/ActivationTestResults.ja=
va Mon Jun 25 16:03:19 2007
@@ -32,6 +32,7 @@
*/
=
public class ActivationTestResults extends TreeOperationResult {
+ private static final long serialVersionUID =3D 3851832795337429744L;
=
public ActivationTestResults() {
}
Modified: trunk/core/src/java/org/jahia/services/version/IsValidForActivati=
onResults.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/version/IsValidForActivationResults.java&rev=3D17771&repn=
ame=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/version/IsValidForActivationResu=
lts.java (original)
+++ trunk/core/src/java/org/jahia/services/version/IsValidForActivationResu=
lts.java Mon Jun 25 16:03:19 2007
@@ -34,6 +34,7 @@
* @version 1.0
*/
public class IsValidForActivationResults extends NodeOperationResult {
+ private static final long serialVersionUID =3D 6153441986599456048L;
=
/**
* Constructor for the result.
Modified: trunk/core/src/java/org/jahia/services/version/RestoreVersionNode=
TestResult.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/version/RestoreVersionNodeTestResult.java&rev=3D17771&rep=
name=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/version/RestoreVersionNodeTestRe=
sult.java (original)
+++ trunk/core/src/java/org/jahia/services/version/RestoreVersionNodeTestRe=
sult.java Mon Jun 25 16:03:19 2007
@@ -31,7 +31,8 @@
*/
=
public class RestoreVersionNodeTestResult extends NodeOperationResult {
-
+ private static final long serialVersionUID =3D 1253569354200131367L;
+ =
public RestoreVersionNodeTestResult (ObjectKey nodeKey, String languag=
eCode,
String comment) {
super(nodeKey, languageCode, comment);
Modified: trunk/core/src/java/org/jahia/services/version/RestoreVersionTest=
Results.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/version/RestoreVersionTestResults.java&rev=3D17771&repnam=
e=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/version/RestoreVersionTestResult=
s.java (original)
+++ trunk/core/src/java/org/jahia/services/version/RestoreVersionTestResult=
s.java Mon Jun 25 16:03:19 2007
@@ -30,7 +30,8 @@
*/
=
public class RestoreVersionTestResults extends TreeOperationResult {
-
+ private static final long serialVersionUID =3D 8153499401578591739L;
+ =
public RestoreVersionTestResults() {
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
