/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 9a5cb77a

Added by Andreas Müller over 6 years ago

ID 9a5cb77ac6a50440c4ec71e8ef88ce0dcb9c16eb
Parent 3e53ce69
Child cbe5c67d

undo unwanted changes

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ImageFile.java
65	65	if(imageInfo != null){
66	66	imageFile.setHeight(imageInfo.getHeight());
67	67	imageFile.setWidth(imageInfo.getWidth());
68		// imageFile.setSize((int)imageInfo.getLength());
69	68	}
70	69
71	70	return imageFile;

             // find best matching representations of each media
             SortedMap<Integer, MediaRepresentation> prefRepresentations
                     = filterAndOrderMediaRepresentations(media.getRepresentations(), null, mimeTypes,
                             size, widthOrDuration, height, false);
                             size, widthOrDuration, height);
             try {
                 // take first one and remove all other representations
                 MediaRepresentation prefOne = prefRepresentations.get(prefRepresentations.firstKey());
-...
             return mediaRepresentationPart;
+        }
         /**
          * @see #findPreferredMedia(List, Class, String[], String[], Integer, Integer, Integer, boolean)
          */
         public static Map<Media, MediaRepresentation> findPreferredMedia(List<Media> mediaList,
                 Class<? extends MediaRepresentationPart> representationPartType, String[] mimeTypes, String[] sizeTokens,
                 Integer widthOrDuration, Integer height, Integer size
                 ) {
             return findPreferredMedia(mediaList, representationPartType, mimeTypes, sizeTokens,
                     widthOrDuration, height, size, false);
+        }
         /**
          * Filters the given List of Media by the supplied filter parameters <code>representationPartType</code>,
-...
          * @param widthOrDuration
          * @param height
          * @param size
          * @param onlyBestMatchIfFilterMatches if <code>true</code> and all required filter parameters
          *      (like size, width and height) are not <code>null</code> only the best matching representation is returned.
          *       Otherwise all representations are returned in sorted order.
          * @return
          */
         public static Map<Media, MediaRepresentation> findPreferredMedia(List<Media> mediaList,
                 Class<? extends MediaRepresentationPart> representationPartType, String[] mimeTypes, String[] sizeTokens,
                 Integer widthOrDuration, Integer height, Integer size,
                 boolean onlyBestMatchIfFilterMatches) {
                 Integer widthOrDuration, Integer height, Integer size) {
             if(mimeTypes != null) {
                 for(int i=0; i<mimeTypes.length; i++){
-...
                     SortedMap<Integer, MediaRepresentation> prefRepresentations
                         = filterAndOrderMediaRepresentations(candidateRepresentations, representationPartType,
                                 mimeTypes, size, widthOrDuration, height, false);
                                 mimeTypes, size, widthOrDuration, height);
                     try {
                         if(prefRepresentations.size() > 0){
                             // Media.representations is a set
-...
+        }
         */
         /**
          * @param mediaRepresentations
          * @param representationPartType
          * @param mimeTypeRegexes
          * @param size
          * @param widthOrDuration
          * @param height
          * @param onlyBestMatchIfFilterMatches if <code>true</code> and all required filter parameters
          *      (like size, width and height) are not <code>null</code> only the best matching representation is returned.
          *       Otherwise all representations are returned in sorted order.
          * @return
+         *
+         *
          */
         private static SortedMap<Integer, MediaRepresentation> filterAndOrderMediaRepresentations(
                 Set<MediaRepresentation> mediaRepresentations,
                 Class<? extends MediaRepresentationPart> representationPartType, String[] mimeTypeRegexes,
                 Integer size, Integer widthOrDuration, Integer height, boolean onlyBestMatchIfFilterMatches) {
                 Integer size, Integer widthOrDuration, Integer height) {
             SortedMap<Integer, MediaRepresentation> prefRepr = new TreeMap<>();
-...
             height = (height == null ? new Integer(0) : height);
             mimeTypeRegexes = (mimeTypeRegexes == null ? new String[]{".*"} : mimeTypeRegexes);
             boolean filterMatches = true;
             for (String mimeTypeRegex : mimeTypeRegexes) {
                 // getRepresentationByMimeType
                 Pattern mimeTypePattern = Pattern.compile(mimeTypeRegex);
-...
                     int dwa = 0;
                     //first the size is used for comparison
                     for (MediaRepresentationPart part : representation.getParts()) {
-...
                         logger.debug(part + " matches");
                         matchingParts.add(part);
                         boolean partFilterMatches = false;
                         if (part.getSize()!= null){
                             int sizeOfPart = part.getSize();
                             int distance = sizeOfPart - size;
-...
                                 distance *= -1;
+                            }
                             dwa += distance;
                             if (size > 0){
                                 partFilterMatches = true;
+                            }
+                        }
                         //if height and width/duration is defined, add this information, too
-...
+                            }
                             dwa += durationWidthWeight;
                         }else{
                             partFilterMatches = true;
+                        }
                         filterMatches &= partFilterMatches;
                     } // loop parts
                     logger.debug("matchingParts.size():" + matchingParts.size());
                     if(matchingParts.size() > 0 ){
-...
                 } // loop representations
             } // loop mime types
             logger.debug(prefRepr.size() + " preferred representations found");
             if (onlyBestMatchIfFilterMatches && filterMatches){
                 SortedMap<Integer, MediaRepresentation> result = new TreeMap<>();
                 try {
                     result.put(prefRepr.firstKey(), prefRepr.get(prefRepr.firstKey()));
                     return result;
                 } catch (Exception e) {
                     return result;
+                }
             }else{
                 return prefRepr;
+            }
             return prefRepr;
+        }
+    }

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 9a5cb77a

Added by Andreas Müller over 6 years ago