[vlma-devel] commit: Mistake for streamOrder support. (Adrien Maglo )
git version control
git at videolan.org
Tue May 20 14:38:04 CEST 2008
vlma | branch: master | Adrien Maglo <magsoft at videolan.org> | Tue May 20 14:19:45 2008 +0200| [8ce0bcbf23d182a16a78e197c1725c9627059c9c]
Mistake for streamOrder support.
Remove not needed imports.
> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=8ce0bcbf23d182a16a78e197c1725c9627059c9c
---
.../java/org/videolan/vlma/model/order/Order.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/vlma-model/src/main/java/org/videolan/vlma/model/order/Order.java b/vlma-model/src/main/java/org/videolan/vlma/model/order/Order.java
index 942212a..d5a36ed 100644
--- a/vlma-model/src/main/java/org/videolan/vlma/model/order/Order.java
+++ b/vlma-model/src/main/java/org/videolan/vlma/model/order/Order.java
@@ -25,20 +25,16 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.net.Socket;
-import java.util.Iterator;
-import java.util.LinkedList;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.videolan.vlma.VLMa;
import org.videolan.vlma.model.adapter.Adapter;
import org.videolan.vlma.model.media.FilesChannel;
-import org.videolan.vlma.model.media.Media;
import org.videolan.vlma.model.media.MediaGroup;
import org.videolan.vlma.model.media.SatChannel;
+import org.videolan.vlma.model.media.StreamChannel;
import org.videolan.vlma.model.media.TNTChannel;
-import org.videolan.vlma.model.server.AbstractServer;
-import org.videolan.vlma.model.server.Server;
/**
* This class represents an order given to a VLC server.
@@ -78,8 +74,9 @@ public abstract class Order {
return new SatOrder();
} else if (FilesChannel.class.equals(mediaClass)) {
return new FilesOrder();
- } else if (StreamOrder.class.equals(mediaClass)) {
+ } else if (StreamChannel.class.equals(mediaClass)) {
return new StreamOrder();
+ }
return null;
}
More information about the vlma-devel
mailing list