inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V4.0-BUG-FIX to HEAD

Browse Source 
36311: BDE-69: filter long tests if minimal.testing property is defined
   36314: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      36247: ALF-11027: temporarily remove import of maven.xml, since it makes ant calls fail from enterpriseprojects
   36331: ALF-12447: Further changes required to fix lower case meta-inf folder name
   36333: Revert ALF-12447.
   36334: ALF-14115: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      36318: ALF-12447: Fix case on META-INF folder for SDK
      36332: ALF-12447: Further changes required to fix lower case meta-inf folder name
   36337: ALF-14115: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      36332: ALF-12447: Yet more meta-inf case changes needed.
   36342: ALF-14120: fix only completed tasks returned
   36343: ALF-13898: starting workflow from IMAP now using workflowDefs with engine name included, fallback to appending $jbpm when not present, to preserve backwards compatibility.
   36345: Fix for ALF-12730 - Email Space Users fails if template is used
   36346: Fix for ALF-9466 - We can search contents sorted by categories in Advanced search in Share, but saved search will not be shown in UI.
   36364: Switch version to 4.0.3
   36375: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/DEV/V4.0-BUG-FIX:
      36366: Tweak to implementation to ensure that on-authentication-failed, the status is updated within a r/w transaction.
      36374: Provide more specific exceptions from the Remote Connector Service for client and server errors
   36376: Fix ALF-14121 - Alfresco fails to start if using "replicating-content-services-context.xml"
   36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
   - CMIS typed query and ordering tests
   36432: ALF-14133: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3)
      << 4.0.x specific change: Changed transformer.complex.OOXML.Image into transformer.complex.Any.Image >>
      << allowing any transformer to be selected for the conversion to JPEG >>
      36427: ALF-14131 Complex transformers fail if a lower level transformer fails even though there is another transformer that could do the transformation
         - Added a base spring bean for all complex transformers
      36362: ALF-14131 Complex transformers fail if a lower level transformer fails even though there is another transformer that could do the transformation
   36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
   - CMIS test data change broke AFTS ID ordering
   36503: Removed thousands of compiler warnings (CMIS query test code)
   36518: Fix for ALF-13778 - Links on Share Repository search page show incorrect link name; do not work when root-node is defined.
   Fix now means that Share search correctly handles overridden Repository root node setting. Original work by Vasily Olhin.
   36520: BDE-69: filter all repo tests if minimal.testing property is defined
   36534: ALF-14116: Latest Surf libs (r1075) - ensure that i18n extensions can process browser sent short locales
   36563: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      36336: ALF-12447: Yet more meta-inf case changes needed.
      36347: Fix for ALF-13920 - Error occurred when try to edit/delete category
      36352: Fix for ALF-13123 - Invalid JSON format from Get Node Tags Webscript - strings not double-quoted. Also fixed POST webscript with same issue.
      36399: ALL LANG: translation updates based on EN r36392
      36421: Fix for Mac Lion versioning issue. ALF-12792 (Part 1 of 2)
      Enable the InfoPassthru and Level2Oplocks server capability flags, InfoPassthru is the flag that fixes the Mac Lion versioning error.
      Added support for filesystems that do not implement the NTFS streams interface in the CIFS transact rename processing, for the Alfresco repo filesystem.
      36422: Fix for Mac Lion versioning issue. ALF-12792 (Part 2 of 2)
      Enable the InfoPassthru and Level2Oplocks server capability flags, InfoPassthru is the flag that fixes the Mac Lion versioning error.
      36423: Add support for file size tracking in the file state. ALF-13616 (Part 1 of 2)
      36424: Fix for Mac MS Word file save issue. ALF-13616 (Part 2 of 2)
      Added live file size tracking to file writing/folder searches so the correct file size is returned before the file is closed.
      36444: Merged DEV to V3.4-BUG-FIX
         36419: ALF-12666 Search against simple-search-additional-attributes doesn't work properly
            SearchContext.buildQuery(int) method was changed.
      36446: Fix for ALF-13404 - Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
       - Effectively removed all PATH based queries using the pattern /companyhome/sites/*/container//* as they are a non-optimized case
       - Replaced the "all sites" doclist query using the above pattern with /companyhome/sites//* plus post query resultset processing based on documentLibrary container matching regex
       - Optimized favorite document query to remove need for a PATH
       - Optimized Content I'm Editing discussion PATH query to use /*/* instead of /*//*
       - Fixed issue where Content I'm Editing discussion results would not always show the root topics that a user has edited
       - Added some addition doclist.get.js query scriptlogger debugging output
      36449: ALF-13404 - Fix for issue where favoriates for all sites would be shown in each site document library in the My Favorites filter.
      36475: ALF-14131 Complex transformers fail if a lower level transformer fails even though there is another transformer that could do the transformation
         - Change base spring bean on example config file
      36480: 36453: ALF-3881 : ldap sync deletion behaviour not flexible enough
         - synchronization.allowDeletions parameter introduced
         - default value is true (existing behaviour)
         - when false, no missing users or groups are deleted from the repository
         - instead they are cleared of their zones and missing groups are cleared of all their members
         - colliding users and groups from different zones are also 'moved' rather than recreated
         - unit test added
      36491: Added CIFS transact2 NT passthru levels for set end of file/set allocation size. ALF-13616.
      Also updated FileInfoLevel with the latest list of NT passthru information levels.
      36497: Fixed ALF-14163: JavaScript Behaviour broken: Node properties cannot be cast to java.io.Serializable
       - Fallout from ALF-12855
       - Made class Serializable (like HashMap would have been)
       - Fixed line endings, too
      36531: ALF-13769: Merged BELARUS/V3.4-BUG-FIX-2012_04_05 to V3.4-BUG-FIX (3.4.10)
         35150: ALF-2645 : 3.2+ ldap sync debug information is too scarce 
            - Improved LDAP logging.
      36532: ALF-13769: BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2012_01_26 to V3.4-BUG-FIX (3.4.10)
         36461: ALF-237: WCM: File conflicts cause file order not to be consistent
            - It is reasonable set values for checkboxes using the indexes from the list, which are not changed. So when we submit the window, the getSelectedNodes method is invoked and 
              it takes selected nodes by checkbox values from "paths" list. 
      36535: Merged DEV to V3.4-BUG-FIX
         36479: ALF-8918 : Cannot "edit offline" a web quick start publication
            A check in TaggableAspect.onUpdatePropertiesOnCommit() was extended to skip the update, if no tags were changed.
      36555: Merged V3.4 to V3.4-BUG-FIX
         36294: ALF-14039: Merged HEAD to V3.4
            31732: ALF-10934: Prevent potential start/stop ping-pong of subsystems across a cluster
               - When a cluster boots up or receives a reinit message it shouldn't be sending out any start messages
   36566: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      36172: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX:
         36169: ALF-8755: After renaming content / space by Contributor via WebDAV new items are created
   36572: Merged V4.0 to V4.0-BUG-FIX
      36388: ALF-14025: Updated Surf libs (1071). Fixes to checksum-disabled dependency handling
      36392: ALF-14129 Failed to do upgrade from 3.4.8 to 4.0.2
         << Committed change for Frederik Heremans >>
         - Moved actual activiti-tables creation to before the upgrade
      36409: Fix for ALF-14124 Solr is not working - Errors occur during the startup
      36466: Fix for ALF-12770 - Infinite loop popup alert in TinyMCE after XSS injection in Alfresco Explorer online edit.
      36501: Merged DEV to V4.0
         36496: ALF-14063 : CLONE - Internet Explorer hangs when using the object picker with a larger number of documents
            YUI 2.9.0 library was modified to use chunked unloading of listeners via a series of setTimeout() functions in event.js for IE 6,7,8.
      36502: ALF-14105: Share Advanced search issue with the form values
      - Fix by David We
      36538: ALF-13986: Updated web.xml and index.jsp redirect to ensure that SSO works with proper surf site-configuration customization
      36539: Fix for ALF-14167 Filtering by Tags/Categories doen't findes any content in Repository/DocumentLibrary
      - fix default namespace back to "" -> "" and fix the specific SOLR tests that require otherwise.
      36541: ALF-14082: Input stream leaks in thumbnail rendering webscripts
      36560: Correctly size content length header after HTML stripping process (ALF-9365)
   36574: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      36316: Merged V4.0-BUG-FIX to V4.0 (4.0.2)
      36391: Merged V4.0-BUG-FIX to V4.0
         36376: Fix ALF-14121 - Alfresco fails to start if using "replicating-content-services-context.xml"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-05-18 17:00:53 +00:00
parent e585e44874
commit d437d5105d
39 changed files with 1855 additions and 1001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorClientException.java Normal file
View File

@@ -0,0 +1,65 @@
/*
* Copyright (C) 2005-2012 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco 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 Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.service.cmr.remoteconnector;
import java.io.IOException;
/**
* An exception thrown when the remote server indicates that the
* client has made a mistake with the request.
* This exception is normally thrown for responses in the 4xx range,
* eg if a 404 (not found) is returned by the remote server.
*
* Provided that the response was not too large, the response from
* the server will also be available.
*
* @author Nick Burch
* @since 4.0.3
*/
public class RemoteConnectorClientException extends IOException
{
private static final long serialVersionUID = -639209368873463536L;
private final int statusCode;
private final String statusText;
private final RemoteConnectorResponse response;
public RemoteConnectorClientException(int statusCode, String statusText,
RemoteConnectorResponse response)
{
super(statusText);
this.statusCode = statusCode;
this.statusText = statusText;
this.response = response;
}
public int getStatusCode()
{
return statusCode;
}
public String getStatusText()
{
return statusText;
}
public RemoteConnectorResponse getResponse()
{
return response;
}
}

6
source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorResponse.java
View File

@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import org.apache.commons.httpclient.Header;
import org.springframework.extensions.webscripts.Status;
/**
* Helper wrapper around a Remote Response, for a request that
@@ -37,6 +38,11 @@ public interface RemoteConnectorResponse
*/
RemoteConnectorRequest getRequest();
/**
* @return The HTTP {@link Status} Code for the response
*/
int getStatus();
/**
* @return The raw response content type, if available
*/

53
source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorServerException.java Normal file
View File

@@ -0,0 +1,53 @@
/*
* Copyright (C) 2005-2012 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco 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 Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.service.cmr.remoteconnector;
import java.io.IOException;
/**
* An exception thrown when the remote server indicates that it
* has encountered a problem with the request, and cannot process
* it. This typically means a 5xx response.
*
* @author Nick Burch
* @since 4.0.3
*/
public class RemoteConnectorServerException extends IOException
{
private static final long serialVersionUID = -639209368873463536L;
private final int statusCode;
private final String statusText;
public RemoteConnectorServerException(int statusCode, String statusText)
{
super(statusText);
this.statusCode = statusCode;
this.statusText = statusText;
}
public int getStatusCode()
{
return statusCode;
}
public String getStatusText()
{
return statusText;
}
}

10
source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorService.java
View File

@@ -44,9 +44,15 @@ public interface RemoteConnectorService
RemoteConnectorRequest buildRequest(String url, String method);
/**
* Executes the specified request, and return the response
* Executes the specified request, and return the response.
*
* @throws IOException If there was a problem with the communication to the server
* @throws AuthenticationException If the authentication details supplied were not accepted
* @throws RemoteConnectorClientException If the server indicates the client request was invalid
* @throws RemoteConnectorServerException If the server was itself unable to perform the request
*/
RemoteConnectorResponse executeRequest(RemoteConnectorRequest request) throws IOException, AuthenticationException;
RemoteConnectorResponse executeRequest(RemoteConnectorRequest request) throws IOException, AuthenticationException,
RemoteConnectorClientException, RemoteConnectorServerException;
/**
* Executes the given request, requesting a JSON response, and

41
source/java/org/alfresco/service/cmr/repository/ContentService.java
View File

@@ -223,6 +223,25 @@ public interface ContentService
@Auditable(parameters = {"sourceMimetype", "targetMimetype"})
public ContentTransformer getTransformer(String sourceMimetype, String targetMimetype);
/**
* Fetch the transformers that are capable of transforming the content in the
* given source mimetype to the given target mimetype with the provided transformation
* options.
* <p/>
* The transformation options provide a finer grain way of discovering the correct transformer,
* since the values and type of the options provided are considered by the transformer when
* deciding whether it can satisfy the transformation request.
* @param sourceUrl TODO
* @param sourceMimetype the source mimetype
* @param sourceSize the source size (bytes). Ignored if negative.
* @param targetMimetype the target mimetype
* @param options the transformation options
*
* @return ContentTransformer the transformers that can be used, or null if none are available
*/
@Auditable(parameters = {"sourceMimetype", "sourceSize", "targetMimetype", "options"})
public List<ContentTransformer> getTransformers(String sourceUrl, String sourceMimetype, long sourceSize, String targetMimetype, TransformationOptions options);
/**
* Fetch the transformer that is capable of transforming the content in the
* given source mimetype to the given target mimetype with the provided transformation
@@ -261,32 +280,14 @@ public interface ContentService
public long getMaxSourceSizeBytes(String sourceMimetype, String targetMimetype, TransformationOptions options);
/**
* Fetch all the transformers that are capable of transforming the content in the
* given source mimetype to the given target mimetype with the provided transformation
* options.
* <p/>
* The transformation options provide a finer grain way of discovering the correct transformer,
* since the values and type of the options provided are considered by the transformer when
* deciding whether it can satisfy the transformation request.
* <p/>
* The list will contain all currently active, applicable transformers sorted in repository preference order.
* The contents of this list may change depending on such factors as the availability of particular transformers
* as well as their current behaviour. For these reasons, this list should not be cached.
*
* @param sourceMimetype the source mimetype
* @param sourceSize the source size (bytes). Ignored if negative.
* @param targetMimetype the target mimetype
* @param options the transformation options
* @return ContentTransformers a List of the transformers that can be used, or the empty list if none were available
*
* @deprecated use {@link #getTransformers(String, String, long, String, TransformationOptions).
* @since 3.5
* @see ContentAccessor#getMimetype()
*/
@Auditable(parameters = {"sourceMimetype", "sourceSize", "targetMimetype", "options"})
public List<ContentTransformer> getActiveTransformers(String sourceMimetype, long sourceSize, String targetMimetype, TransformationOptions options);
/**
* @deprecated use overloaded method with sourceSize parameter.
* @deprecated use {@link #getTransformers(String, String, long, String, TransformationOptions).
*/
public List<ContentTransformer> getActiveTransformers(String sourceMimetype, String targetMimetype, TransformationOptions options);

36
source/java/org/alfresco/service/cmr/repository/TransformationOptionLimits.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
* Copyright (C) 2005-2012 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -56,11 +56,20 @@ public class TransformationOptionLimits
pages = new TransformationOptionPair();
}
private TransformationOptionLimits(TransformationOptionLimits a, TransformationOptionLimits b)
private TransformationOptionLimits(TransformationOptionLimits a, TransformationOptionLimits b, boolean lower)
{
time = a.time.combine(b.time);
kbytes = a.kbytes.combine(b.kbytes);
pages = a.pages.combine(b.pages);
if (lower)
{
time = a.time.combine(b.time);
kbytes = a.kbytes.combine(b.kbytes);
pages = a.pages.combine(b.pages);
}
else
{
time = a.time.combineUpper(b.time);
kbytes = a.kbytes.combineUpper(b.kbytes);
pages = a.pages.combineUpper(b.pages);
}
}
// --------------- Time ---------------
@@ -179,7 +188,22 @@ public class TransformationOptionLimits
*/
public TransformationOptionLimits combine(final TransformationOptionLimits that)
{
return new TransformationOptionLimits(this, that)
return combine(that, true);
}
/**
* Returns a TransformationOptionLimits that has getter methods that combine the
* the values from the getter methods of this and the supplied TransformationOptionLimits
* so that they return the lowest common denominator of the limits .
*/
public TransformationOptionLimits combineUpper(final TransformationOptionLimits that)
{
return combine(that, false);
}
private TransformationOptionLimits combine(final TransformationOptionLimits that, boolean lower)
{
return new TransformationOptionLimits(this, that, lower)
{
@Override
public void setTimeoutMs(long timeoutMs)

79
source/java/org/alfresco/service/cmr/repository/TransformationOptionLimitsTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
* Copyright (C) 2005-2012 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -229,20 +229,85 @@ public class TransformationOptionLimitsTest
@Test
public void testCombine() throws Exception
{
limits.setReadLimitTimeMs(123); // limit >
limits.setReadLimitKBytes(45); // limit <
limits.setMaxPages(789); // max =
limits.setReadLimitTimeMs(123);
limits.setReadLimitKBytes(45);
limits.setPageLimit(789);
TransformationOptionLimits second = new TransformationOptionLimits();
second.setTimeoutMs(12); // max <
second.setMaxSourceSizeKBytes(456); // max >
second.setMaxPages(789); // max =
second.setTimeoutMs(12);
second.setMaxSourceSizeKBytes(456);
second.setMaxPages(789);
TransformationOptionLimits combined = limits.combine(second);
assertEquals("Expected the lower value", 12, combined.getTimeoutMs()); // max <
assertEquals("Expected the lower value", 45, combined.getReadLimitKBytes()); // limit <
assertEquals("Expected the lower value", 789, combined.getMaxPages()); // max =
assertEquals("Expected -1 as max is set", -1, combined.getReadLimitTimeMs()); // max <
assertEquals("Expected -1 as limit is set", -1, combined.getMaxSourceSizeKBytes()); // limit <
assertEquals("Expected -1 as limit is the same", -1, combined.getPageLimit()); // max =
}
@Test
public void testCombineLimits() throws Exception
{
limits.setReadLimitTimeMs(123);
limits.setReadLimitKBytes(45);
limits.setPageLimit(789);
TransformationOptionLimits second = new TransformationOptionLimits();
second.setReadLimitTimeMs(12);
second.setReadLimitKBytes(-1);
second.setPageLimit(789);
TransformationOptionLimits combined = limits.combine(second);
assertEquals("Expected the lower value", 12, combined.getReadLimitTimeMs());
assertEquals("Expected the lower value", 45, combined.getReadLimitKBytes());
assertEquals("Expected the lower value", 789, combined.getPageLimit());
}
@Test
public void testCombineUpper() throws Exception
{
limits.setReadLimitTimeMs(123);
limits.setReadLimitKBytes(45);
limits.setPageLimit(789);
TransformationOptionLimits second = new TransformationOptionLimits();
second.setTimeoutMs(12);
second.setMaxSourceSizeKBytes(456);
second.setMaxPages(789);
TransformationOptionLimits combined = limits.combineUpper(second);
assertEquals("Expected -1 as only one max value was set", -1, combined.getTimeoutMs());
assertEquals("Expected -1 as only one max value was set", -1, combined.getMaxSourceSizeKBytes());
assertEquals("Expected -1 as only one max value was set", -1, combined.getMaxPages());
assertEquals("Expected -1 as only one limit value was set", -1, combined.getReadLimitTimeMs());
assertEquals("Expected -1 as only one limit value was set", -1, combined.getReadLimitKBytes());
assertEquals("Expected -1 as only one limit value was set", -1, combined.getPageLimit());
}
@Test
public void testCombineUpperLimits() throws Exception
{
limits.setReadLimitTimeMs(123);
limits.setReadLimitKBytes(45);
limits.setPageLimit(789);
TransformationOptionLimits second = new TransformationOptionLimits();
second.setReadLimitTimeMs(12);
second.setReadLimitKBytes(-1);
second.setPageLimit(789);
TransformationOptionLimits combined = limits.combineUpper(second);
assertEquals("Expected the higher value", 123, combined.getReadLimitTimeMs());
assertEquals("Expected -1 as only one limit value was set", -1, combined.getReadLimitKBytes());
assertEquals("Expected the higher value", 789, combined.getPageLimit());
}
@Test

102
source/java/org/alfresco/service/cmr/repository/TransformationOptionPair.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
* Copyright (C) 2005-2012 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -128,6 +128,19 @@ public class TransformationOptionPair
}
return Math.min(value1, value2);
}
/**
* Returns the higher (common denominator) of the two value supplied.
* If either value is less than 0, -1 is returned.
*/
private long maxSet(long value1, long value2)
{
if (value1 < 0 || value2 < 0)
{
return -1;
}
return Math.max(value1, value2);
}
public Map<String, Object> toMap(Map<String, Object> optionsMap, String optMaxKey, String optLimitKey)
{
@@ -161,24 +174,81 @@ public class TransformationOptionPair
* Returns a TransformationOptionPair that has getter methods that combine the
* the values from the getter methods of this and the supplied TransformationOptionPair.
*/
public TransformationOptionPair combine(final TransformationOptionPair that)
public TransformationOptionPair combine(TransformationOptionPair that)
{
return combine(that, true);
}
/**
* Returns a TransformationOptionPair that has getter methods that combine the
* the values from the getter methods of this and the supplied TransformationOptionPair
* so that they return the lowest common denominator of the two limits .
*/
public TransformationOptionPair combineUpper(final TransformationOptionPair that)
{
return combine(that, false);
}
private TransformationOptionPair combine(final TransformationOptionPair that, final boolean lower)
{
return new TransformationOptionPair()
{
/**
* Combines max values of this TransformationOptionPair and the supplied
* one to return the max to be used in a transformation. The limit
* one to return the max to be used in a transformation. When 'lower' the max
* value is discarded (-1 is returned) if the combined limit value is lower.
* When 'not lower' (lowest common denominator) the max is only returned if the
* limit value is -1.
*/
@Override
public long getMax()
{
long max = minSet(TransformationOptionPair.this.getMax(), that.getMax());
long limit = minSet(TransformationOptionPair.this.getLimit(), that.getLimit());
long max = getMaxValue();
long limit = getLimitValue();
return (max >= 0 && (limit < 0 || limit >= max))
? max
: -1;
return lower
? (max >= 0 && (limit < 0 || limit >= max))
? max
: -1
: (limit < 0)
? max
: -1;
}
/**
* Combines limit values of this TransformationOptionPair and the supplied
* one to return the limit to be used in a transformation. When 'lower' the limit
* value is discarded (-1 is returned) if the combined max value is lower.
* When 'not lower' (lowest common denominator) the limit is only returned if the
* max value is -1.
*/
@Override
public long getLimit()
{
long max = getMaxValue();
long limit = getLimitValue();
return lower
? (limit >= 0 && (max < 0 || max > limit))
? limit
: -1
: (max < 0)
? limit
: -1;
}
private long getLimitValue()
{
return lower
? minSet(TransformationOptionPair.this.getLimit(), that.getLimit())
: maxSet(TransformationOptionPair.this.getLimit(), that.getLimit());
}
private long getMaxValue()
{
return lower
? minSet(TransformationOptionPair.this.getMax(), that.getMax())
: maxSet(TransformationOptionPair.this.getMax(), that.getMax());
}
@Override
@@ -186,22 +256,6 @@ public class TransformationOptionPair
{
throw new UnsupportedOperationException();
}
/**
* Combines limit values of this TransformationOptionPair and the supplied
* one to return the limit to be used in a transformation. The limit
* value is discarded (-1 is returned) if the combined max value is lower.
*/
@Override
public long getLimit()
{
long max = minSet(TransformationOptionPair.this.getMax(), that.getMax());
long limit = minSet(TransformationOptionPair.this.getLimit(), that.getLimit());
return (limit >= 0 && (max < 0 || max >= limit))
? limit
: -1;
}
@Override
public void setLimit(long limit, String exceptionMessage)