You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fu...@apache.org on 2006/05/04 17:38:50 UTC
svn commit: r399741 - in /incubator/felix/trunk:
org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/
org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/
org.apache.feli...
Author: furfari
Date: Thu May 4 08:38:48 2006
New Revision: 399741
URL: http://svn.apache.org/viewcvs?rev=399741&view=rev
Log:
The trivial work is done :). We should only verify that all the exception related to code error 401-403-404-501 are generated by the lower layer
Removed:
incubator/felix/trunk/org.apache.felix.upnp.extra/src/main/java/org/apache/felix/upnp/extra/util/UPnPException.java
Modified:
incubator/felix/trunk/org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java
incubator/felix/trunk/org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java
incubator/felix/trunk/org.apache.felix.upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/ActionPanel.java
Modified: incubator/felix/trunk/org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java?rev=399741&r1=399740&r2=399741&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java (original)
+++ incubator/felix/trunk/org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/export/GeneralActionListener.java Thu May 4 08:38:48 2006
@@ -38,7 +38,7 @@
import org.apache.felix.upnp.basedriver.Activator;
import org.apache.felix.upnp.extra.util.Converter;
-import org.apache.felix.upnp.extra.util.UPnPException;
+import org.osgi.service.upnp.UPnPException;
/**
* @author Stefano "Kismet" Lenzi
@@ -107,7 +107,7 @@
outArgs=osgiAct.invoke(inArgs);
} catch (UPnPException e) {
//TODO Activator.logger.log()
- upnpAct.setStatus(e.getErrorCode(),e.getErrorDescription());
+ upnpAct.setStatus(e.getUPnPError_Code(),e.getMessage());
invalidAction=true;
} catch (Exception e){
//TODO Activator.logger.log()
Modified: incubator/felix/trunk/org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java?rev=399741&r1=399740&r2=399741&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java (original)
+++ incubator/felix/trunk/org.apache.felix.upnp.basedriver/src/main/java/org/apache/felix/upnp/basedriver/importer/core/upnp/UPnPActionImpl.java Thu May 4 08:38:48 2006
@@ -30,7 +30,7 @@
import org.osgi.service.upnp.UPnPStateVariable;
import org.apache.felix.upnp.extra.util.Converter;
-import org.apache.felix.upnp.extra.util.UPnPException;
+import org.osgi.service.upnp.UPnPException;
/**
* @author Matteo "matted" Demuru
Modified: incubator/felix/trunk/org.apache.felix.upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/ActionPanel.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.apache.felix.upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/ActionPanel.java?rev=399741&r1=399740&r2=399741&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/ActionPanel.java (original)
+++ incubator/felix/trunk/org.apache.felix.upnp.tester/src/main/java/org/apache/felix/upnp/tester/gui/ActionPanel.java Thu May 4 08:38:48 2006
@@ -44,7 +44,7 @@
import javax.swing.table.TableModel;
import org.apache.felix.upnp.extra.util.Converter;
-import org.apache.felix.upnp.extra.util.UPnPException;
+import org.osgi.service.upnp.UPnPException;
import org.apache.felix.upnp.tester.Mediator;
import org.osgi.service.upnp.UPnPAction;
import org.osgi.service.upnp.UPnPStateVariable;
@@ -107,8 +107,8 @@
catch (UPnPException ex){
String error =
"===== Action Failed =====" +
- "\nUPnP Error Code::\n " +ex.getErrorCode() +
- "\nUPnP Error Description::\n " +ex.getErrorDescription();
+ "\nUPnP Error Code::\n " +ex.getUPnPError_Code() +
+ "\nUPnP Error Description::\n " +ex.getMessage();
printReport(params,error);
JOptionPane.showMessageDialog(
Mediator.getPropertiesViewer(),error);