Author: michiel
Date: 2010-02-17 16:31:45 +0100 (Wed, 17 Feb 2010)
New Revision: 41116
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/builders/MediaSources.java
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/urlcomposers/URLComposer.java
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/urlcomposers/URLComposerFactory.java
Log:
Moved MimeType to mmbase-core
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/builders/MediaSources.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/builders/MediaSources.java
2010-02-17 15:31:42 UTC (rev 41115)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/builders/MediaSources.java
2010-02-17 15:31:45 UTC (rev 41116)
@@ -17,6 +17,7 @@
import org.mmbase.bridge.Node;
import org.mmbase.util.functions.*;
+import org.mmbase.util.MimeType;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -25,7 +26,6 @@
import org.mmbase.applications.media.Format;
import org.mmbase.applications.media.Codec;
import org.mmbase.applications.media.State;
-import org.mmbase.applications.media.MimeType;
@@ -501,7 +501,7 @@
checkFields(node);
return super.commit(node);
}
-
+
@Override
public synchronized int insert(String owner, MMObjectNode node) {
checkFields(node);
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/urlcomposers/URLComposer.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/urlcomposers/URLComposer.java
2010-02-17 15:31:42 UTC (rev 41115)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/urlcomposers/URLComposer.java
2010-02-17 15:31:45 UTC (rev 41116)
@@ -12,9 +12,9 @@
import org.mmbase.applications.media.builders.MediaProviders;
import org.mmbase.applications.media.builders.MediaSources;
-import org.mmbase.applications.media.MimeType;
import org.mmbase.module.core.MMObjectNode;
import org.mmbase.util.HashCodeUtil;
+import org.mmbase.util.MimeType;
import org.mmbase.applications.media.Format;
import org.mmbase.applications.media.Codec;
import org.mmbase.applications.media.State;
@@ -83,7 +83,7 @@
public int getBitrate() {
return source.getIntValue("bitrate");
}
-
+
/**
* The mime-type of the produced URL. This is not necessarily the mimetype
of the source.
* (Though it normally would be)
@@ -179,7 +179,7 @@
/* The source */
public boolean isMain() {
- if (source != null && (source.getIntValue("state") ==
State.SOURCE.getValue() ||
+ if (source != null && (source.getIntValue("state") ==
State.SOURCE.getValue() ||
source.getIntValue("state") ==
State.SOURCE_UNSUPPORTED.getValue()) ) {
return true;
} else {
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/urlcomposers/URLComposerFactory.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/urlcomposers/URLComposerFactory.java
2010-02-17 15:31:42 UTC (rev 41115)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/urlcomposers/URLComposerFactory.java
2010-02-17 15:31:45 UTC (rev 41116)
@@ -11,7 +11,6 @@
package org.mmbase.applications.media.urlcomposers;
import org.mmbase.applications.media.Format;
-import org.mmbase.applications.media.MimeType;
import org.mmbase.applications.media.builders.MediaFragments;
import org.mmbase.module.core.MMObjectNode;
import org.mmbase.util.logging.Logger;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
