Revision: 3961
Author: [email protected]
Date: Tue Oct 12 12:15:20 2010
Log: Changes to imports from moving JSONMessage to the library.
http://code.google.com/p/power-architect/source/detail?r=3961
Deleted:
/trunk/src/main/java/ca/sqlpower/architect/enterprise/JSONMessage.java
Modified:
/trunk/src/main/java/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java
/trunk/src/main/java/ca/sqlpower/architect/enterprise/JSONResponseHandler.java
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/enterprise/JSONMessage.java
Tue Apr 27 10:08:58 2010
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2010, SQL Power Group Inc.
- *
- * This file is part of Power*Architect.
- *
- * Power*Architect is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Power*Architect 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 Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ca.sqlpower.architect.enterprise;
-
-/**
- * A class that holds JSON and other response values for a response from a
- * server.
- */
-public class JSONMessage {
- private final String message;
-
- /**
- * The status code of the response.
- */
- private final int statusCode;
-
- /**
- * @param message
- * The body of the response from the server. This may be
but is
- * not limited to: an error message, exception, or JSON of
- * persist calls.
- * @param statusCode
- * The code that was returned in the response.
- */
- public JSONMessage(String message, int statusCode) {
- this.message = message;
- this.statusCode = statusCode;
- }
-
- public String getBody() {
- return message;
- }
-
- public int getStatusCode() {
- return statusCode;
- }
-
- /**
- * Returns true if the status code is in the 200s.
- */
- public boolean isSuccessful() {
- return (statusCode >= 200 && statusCode < 300);
- }
-
- public String toString() {
- return "Message (" + statusCode + "): " + message;
- }
-}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java
Wed Sep 15 08:25:34 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java
Tue Oct 12 12:15:20 2010
@@ -72,6 +72,7 @@
import ca.sqlpower.diff.DiffChunk;
import ca.sqlpower.diff.DiffInfo;
import ca.sqlpower.diff.SimpleDiffChunkJSONConverter;
+import ca.sqlpower.enterprise.JSONMessage;
import ca.sqlpower.enterprise.TransactionInformation;
import ca.sqlpower.enterprise.client.RevisionController;
import ca.sqlpower.enterprise.client.SPServerInfo;
@@ -98,9 +99,9 @@
import ca.sqlpower.swingui.event.SessionLifecycleListener;
import ca.sqlpower.util.SQLPowerUtils;
import ca.sqlpower.util.TransactionEvent;
-import ca.sqlpower.util.UserPrompterFactory;
import ca.sqlpower.util.UserPrompter.UserPromptOptions;
import ca.sqlpower.util.UserPrompter.UserPromptResponse;
+import ca.sqlpower.util.UserPrompterFactory;
public class ArchitectClientSideSession extends ArchitectSessionImpl
implements RevisionController {
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/enterprise/JSONResponseHandler.java
Fri Aug 20 11:26:13 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/enterprise/JSONResponseHandler.java
Tue Oct 12 12:15:20 2010
@@ -29,6 +29,8 @@
import org.json.JSONObject;
import org.springframework.security.AccessDeniedException;
+import ca.sqlpower.enterprise.JSONMessage;
+
public class JSONResponseHandler implements ResponseHandler<JSONMessage> {
private static final Logger logger =
Logger.getLogger(JSONResponseHandler.class);
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
Thu Sep 9 07:53:46 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
Tue Oct 12 12:15:20 2010
@@ -55,6 +55,7 @@
import ca.sqlpower.dao.SPSessionPersister;
import ca.sqlpower.dao.json.SPJSONMessageDecoder;
import ca.sqlpower.dao.session.SessionPersisterSuperConverter;
+import ca.sqlpower.enterprise.JSONMessage;
import ca.sqlpower.object.SPObject;
import ca.sqlpower.sqlobject.SQLRelationship.ColumnMapping;
import ca.sqlpower.util.MonitorableImpl;
