Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/report/AbstractCmisTestReport.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/report/AbstractCmisTestReport.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/report/AbstractCmisTestReport.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/report/AbstractCmisTestReport.java Thu Aug 13 12:05:59 2015 @@ -34,9 +34,11 @@ import org.apache.chemistry.opencmis.tck */ public abstract class AbstractCmisTestReport implements CmisTestReport { + @Override public abstract void createReport(Map<String, String> parameters, List<CmisTestGroup> groups, Writer writer) throws Exception; + @Override public void createReport(Map<String, String> parameters, List<CmisTestGroup> groups, File file) throws Exception { Writer writer = new OutputStreamWriter(new FileOutputStream(file), IOUtils.UTF8); try {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/runner/CmisTckAntTask.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/runner/CmisTckAntTask.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/runner/CmisTckAntTask.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/runner/CmisTckAntTask.java Thu Aug 13 12:05:59 2015 @@ -139,20 +139,25 @@ public class CmisTckAntTask extends Task } private class AntProgressMonitor implements CmisTestProgressMonitor { + @Override public void startGroup(CmisTestGroup group) { log(group.getName() + " (" + group.getTests().size() + " tests)"); } + @Override public void endGroup(CmisTestGroup group) { } + @Override public void startTest(CmisTest test) { log(" " + test.getName()); } + @Override public void endTest(CmisTest test) { } + @Override public void message(String msg) { log(msg); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/runner/ConsoleRunner.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/runner/ConsoleRunner.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/runner/ConsoleRunner.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/runner/ConsoleRunner.java Thu Aug 13 12:05:59 2015 @@ -56,24 +56,29 @@ public class ConsoleRunner extends Abstr private static class ConsoleProgressMonitor implements CmisTestProgressMonitor { + @Override @SuppressWarnings("PMD.SystemPrintln") public void startGroup(CmisTestGroup group) { System.out.println(group.getName() + " (" + group.getTests().size() + " tests)"); } + @Override @SuppressWarnings("PMD.SystemPrintln") public void endGroup(CmisTestGroup group) { System.out.println(); } + @Override @SuppressWarnings("PMD.SystemPrintln") public void startTest(CmisTest test) { System.out.print('.'); } + @Override public void endTest(CmisTest test) { } + @Override @SuppressWarnings("PMD.SystemPrintln") public void message(String msg) { System.out.println(msg); Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/runner/WebRunnerServlet.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/runner/WebRunnerServlet.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/runner/WebRunnerServlet.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/runner/WebRunnerServlet.java Thu Aug 13 12:05:59 2015 @@ -74,7 +74,7 @@ public class WebRunnerServlet extends Ht printHeader(pw); Map<String, String> parameters = new HashMap<String, String>(); - Map<String, String[]> parameterMap = (Map<String, String[]>) req.getParameterMap(); + Map<String, String[]> parameterMap = req.getParameterMap(); if (parameterMap != null) { for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) { @@ -136,26 +136,31 @@ public class WebRunnerServlet extends Ht this.pw = pw; } + @Override public void startGroup(CmisTestGroup group) { pw.println("<h3>" + group.getName() + " (" + group.getTests().size() + " tests)</h3>"); pw.flush(); } + @Override public void endGroup(CmisTestGroup group) { pw.println("<br>"); pw.flush(); } + @Override public void startTest(CmisTest test) { pw.print(" " + test.getName() + " ... "); pw.flush(); } + @Override public void endTest(CmisTest test) { pw.println("completed<br>"); pw.flush(); } + @Override public void message(String msg) { pw.println(msg); pw.flush(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/CreateAndDeleteDocumentTest.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/CreateAndDeleteDocumentTest.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/CreateAndDeleteDocumentTest.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/CreateAndDeleteDocumentTest.java Thu Aug 13 12:05:59 2015 @@ -61,8 +61,8 @@ public class CreateAndDeleteDocumentTest int numOfDocuments = 20; - OperationContext orderContext = (isOrderByNameSupported(session) ? SELECT_ALL_NO_CACHE_OC_ORDER_BY_NAME - : SELECT_ALL_NO_CACHE_OC); + OperationContext orderContext = isOrderByNameSupported(session) ? SELECT_ALL_NO_CACHE_OC_ORDER_BY_NAME + : SELECT_ALL_NO_CACHE_OC; // create a test folder Folder testFolder = createTestFolder(session); Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/query/QuerySmokeTest.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/query/QuerySmokeTest.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/query/QuerySmokeTest.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/query/QuerySmokeTest.java Thu Aug 13 12:05:59 2015 @@ -160,6 +160,6 @@ public class QuerySmokeTest extends Abst CmisTestResultImpl result = createResult(getWorst(results), message); result.getChildren().addAll(results); - return (result.getStatus().getLevel() <= OK.getLevel() ? null : result); + return result.getStatus().getLevel() <= OK.getLevel() ? null : result; } } Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/versioning/VersioningSmokeTest.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/versioning/VersioningSmokeTest.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/versioning/VersioningSmokeTest.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/versioning/VersioningSmokeTest.java Thu Aug 13 12:05:59 2015 @@ -211,7 +211,7 @@ public class VersioningSmokeTest extends // test the latest version Document latest = session.getLatestDocumentVersion(doc, SELECT_ALL_NO_CACHE_OC); - f = createResult(FAILURE, "getObjectOfLatestVersion() did not returned the expected version!"); + f = createResult(FAILURE, "getObjectOfLatestVersion() did not return the expected version!"); addResult(assertEquals(fifthVersion.getId(), latest.getId(), null, f)); // test if checking out a non-latest version works for this @@ -336,6 +336,6 @@ public class VersioningSmokeTest extends CmisTestResultImpl result = createResult(getWorst(results), message); result.getChildren().addAll(results); - return (result.getStatus().getLevel() <= OK.getLevel() ? null : result); + return result.getStatus().getLevel() <= OK.getLevel() ? null : result; } } Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/mapper/AbstractPropertyMapper.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/mapper/AbstractPropertyMapper.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/mapper/AbstractPropertyMapper.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/mapper/AbstractPropertyMapper.java Thu Aug 13 12:05:59 2015 @@ -29,6 +29,7 @@ public abstract class AbstractPropertyMa protected String propPrefix; protected String dateFormat = DEFAULT_DATE_FORMAT; + @Override public boolean initialize(String cfgPrefix, String typeKey, Properties properties) { propPrefix = cfgPrefix + "." + typeKey; cmisTypeId = properties.getProperty(propPrefix + ".typeId"); @@ -51,10 +52,12 @@ public abstract class AbstractPropertyMa return true; } + @Override public String getMappedTypeId() { return cmisTypeId; } + @Override public String[] getContentTypes() { return contentTypes; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/mapper/PropertyMapperExif.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/mapper/PropertyMapperExif.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/mapper/PropertyMapperExif.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/mapper/PropertyMapperExif.java Thu Aug 13 12:05:59 2015 @@ -71,6 +71,7 @@ public class PropertyMapperExif extends return true; } + @Override public void reset() { propMap = new HashMap<String, Object>(); } @@ -100,10 +101,12 @@ public class PropertyMapperExif extends return cmisTypeId; } + @Override public String getMappedPropertyId(String key) { return null; } + @Override public Object convertValue(String id, PropertyDefinition<?> propDef, String strValue) { return null; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/mapper/PropertyMapperTika.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/mapper/PropertyMapperTika.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/mapper/PropertyMapperTika.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/mapper/PropertyMapperTika.java Thu Aug 13 12:05:59 2015 @@ -55,14 +55,17 @@ public class PropertyMapperTika extends return true; } + @Override public void reset() { } + @Override public String getMappedPropertyId(String key) { String propId = propMapTags.get(key); return propId; } + @Override public Object convertValue(String key, PropertyDefinition<?> propDef, String strValueParam) { String strValue = strValueParam; Object value = null; Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/parser/AbstractMetadataParser.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/parser/AbstractMetadataParser.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/parser/AbstractMetadataParser.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/parser/AbstractMetadataParser.java Thu Aug 13 12:05:59 2015 @@ -33,15 +33,18 @@ public abstract class AbstractMetadataPa protected AbstractMetadataParser() { } + @Override public void initialize(PropertyMapper mapper, String contentType) { this.mapper = mapper; reset(); } + @Override public Map<String, Object> getCmisProperties() { return cmisProperties; } + @Override public void reset() { String typeId = mapper.getMappedTypeId(); cmisProperties = new HashMap<String, Object>(); @@ -53,14 +56,17 @@ public abstract class AbstractMetadataPa cmisProperties.put(PropertyIds.OBJECT_TYPE_ID, typeId); } + @Override public String[] getContentTypes() { return mapper.getContentTypes(); } + @Override public String getMappedTypeId() { return mapper.getMappedTypeId(); } + @Override public PropertyMapper getMapper() { return mapper; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/parser/MetadataParserExif.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/parser/MetadataParserExif.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/parser/MetadataParserExif.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/parser/MetadataParserExif.java Thu Aug 13 12:05:59 2015 @@ -43,6 +43,7 @@ public class MetadataParserExif extends private static final Logger LOG = LoggerFactory.getLogger(MetadataParserExif.class.getName()); + @Override public void extractMetadata(File f, TypeDefinition td, Session session) throws MapperException { reset(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/parser/MetadataParserTika.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/parser/MetadataParserTika.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/parser/MetadataParserTika.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/parser/MetadataParserTika.java Thu Aug 13 12:05:59 2015 @@ -45,6 +45,7 @@ public class MetadataParserTika extends public MetadataParserTika() { } + @Override public void extractMetadata(File f, TypeDefinition td, Session session) throws MapperException { try { InputStream stream = new FileInputStream(f); Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/content/loremipsum/LoremIpsum.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/content/loremipsum/LoremIpsum.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/content/loremipsum/LoremIpsum.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/content/loremipsum/LoremIpsum.java Thu Aug 13 12:05:59 2015 @@ -27,7 +27,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Random; import java.util.Set; /** @@ -61,7 +60,7 @@ public class LoremIpsum { return false; } - return (len1 == ((WordLengthPair) other).len1 && len2 == ((WordLengthPair) other).len2); + return len1 == ((WordLengthPair) other).len1 && len2 == ((WordLengthPair) other).len2; } @Override @@ -184,11 +183,11 @@ public class LoremIpsum { */ private WordInfo randomChoice(WordInfo[] array) { return array[randomInt(array.length)]; - }; + } private String randomChoice(String[] array) { return array[randomInt(array.length)]; - }; + } private int randomInt(int length) { return randomGenerator.nextInt(length); @@ -211,7 +210,7 @@ public class LoremIpsum { generateChains(this.sample); generateStatistics(this.sample); initializeDictionary(this.dictionary); - }; + } public LoremIpsum(String sample, String dictionary) { this.sample = sample; @@ -219,7 +218,7 @@ public class LoremIpsum { generateChains(this.sample); generateStatistics(this.sample); initializeDictionary(this.dictionary); - }; + } public LoremIpsum(String sample, String[] newDictionary) { this.sample = sample; @@ -227,7 +226,7 @@ public class LoremIpsum { generateChains(this.sample); generateStatistics(this.sample); initializeDictionary(newDictionary); - }; + } public LoremIpsum(String sample) { this.sample = sample; @@ -239,7 +238,7 @@ public class LoremIpsum { generateChains(this.sample); generateStatistics(this.sample); initializeDictionary(dictWords); - }; + } /** * Generates a single lorem ipsum paragraph, of random length. @@ -1172,5 +1171,4 @@ public class LoremIpsum { } } } - } Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/MultiThreadedObjectGenerator.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/MultiThreadedObjectGenerator.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/MultiThreadedObjectGenerator.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/MultiThreadedObjectGenerator.java Thu Aug 13 12:05:59 2015 @@ -30,7 +30,7 @@ import org.apache.chemistry.opencmis.uti public class MultiThreadedObjectGenerator { public static enum Action { - CreateDocument, CreateTree, CreateFolders, CreateTypes + CREATE_DOCUMENT, CREATE_TREE, CREATE_FOLDERS, CREATE_TYPES } private MultiThreadedObjectGenerator() { @@ -50,14 +50,15 @@ public class MultiThreadedObjectGenerato fAction = action; } + @Override public void run() { - if (fAction == Action.CreateDocument) { + if (fAction == Action.CREATE_DOCUMENT) { doCreateDocument(); - } else if (fAction == Action.CreateTree) { + } else if (fAction == Action.CREATE_TREE) { doCreateTree(); - } else if (fAction == Action.CreateFolders) { + } else if (fAction == Action.CREATE_FOLDERS) { doCreateFolder(); - } else if (fAction == Action.CreateTypes) { + } else if (fAction == Action.CREATE_TYPES) { doCreateTypes(); } } @@ -74,7 +75,7 @@ public class MultiThreadedObjectGenerato public String[] doCreateFolder() { return fObjGen.createFolders(fRootFolderId, fCount); } - + public void doCreateTypes() { fObjGen.createTypes(fTypeDefList); } @@ -93,7 +94,7 @@ public class MultiThreadedObjectGenerato NavigationService navSvc = binding.getNavigationService(); ObjectService objSvc = binding.getObjectService(); RepositoryService repSvc = binding.getRepositoryService(); - + ObjectGenerator gen = new ObjectGenerator(objectFactory, navSvc, objSvc, repSvc, repoId, contentKind); gen.setUseUuidsForNames(true); gen.setNumberOfDocumentsToCreatePerFolder(docsPerFolder); @@ -126,7 +127,7 @@ public class MultiThreadedObjectGenerato ObjectGenerator objGen = createObjectGenerator(binding, repoId, docsPerFolder, foldersPerFolders, depth, documentType, folderType, contentSizeInKB, rootFolderId, contentKind, doCleanup); - ObjectGeneratorRunner gen = new ObjectGeneratorRunner(objGen, Action.CreateTree); + ObjectGeneratorRunner gen = new ObjectGeneratorRunner(objGen, Action.CREATE_TREE); gen.fFoldersPerFolders = foldersPerFolders; gen.fDepth = depth; gen.fRootFolderId = getRootFolderId(binding, repoId, rootFolderId); @@ -140,10 +141,9 @@ public class MultiThreadedObjectGenerato ObjectGeneratorRunner[] runners = new ObjectGeneratorRunner[rootFolderIds.length]; for (int i = 0; i < rootFolderIds.length; i++) { ObjectGenerator objGen = createObjectGenerator(provider, repoId, docsPerFolder, foldersPerFolders, depth, - documentType, folderType, contentSizeInKB, rootFolderIds[i], contentKind, - doCleanup); + documentType, folderType, contentSizeInKB, rootFolderIds[i], contentKind, doCleanup); - ObjectGeneratorRunner gen = new ObjectGeneratorRunner(objGen, Action.CreateTree); + ObjectGeneratorRunner gen = new ObjectGeneratorRunner(objGen, Action.CREATE_TREE); gen.fFoldersPerFolders = foldersPerFolders; gen.fDepth = depth; gen.fRootFolderId = rootFolderIds[i]; @@ -153,13 +153,13 @@ public class MultiThreadedObjectGenerato } public static ObjectGeneratorRunner prepareForCreateDocument(CmisBinding provider, String repoId, - String documentType, int contentSizeInKB, String rootFolderId, int noDocuments, - ContentKind contentKind, boolean doCleanup) { + String documentType, int contentSizeInKB, String rootFolderId, int noDocuments, ContentKind contentKind, + boolean doCleanup) { ObjectGenerator objGen = createObjectGenerator(provider, repoId, 0, 0, 0, documentType, null, contentSizeInKB, rootFolderId, contentKind, doCleanup); - ObjectGeneratorRunner gen = new ObjectGeneratorRunner(objGen, Action.CreateDocument); + ObjectGeneratorRunner gen = new ObjectGeneratorRunner(objGen, Action.CREATE_DOCUMENT); gen.fRootFolderId = getRootFolderId(provider, repoId, rootFolderId); gen.fCount = noDocuments; return gen; @@ -174,7 +174,7 @@ public class MultiThreadedObjectGenerato ObjectGenerator objGen = createObjectGenerator(binding, repoId, 0, 0, 0, documentType, null, contentSizeInKB, rootFolderId, contentKind, doCleanup); - ObjectGeneratorRunner gen = new ObjectGeneratorRunner(objGen, Action.CreateDocument); + ObjectGeneratorRunner gen = new ObjectGeneratorRunner(objGen, Action.CREATE_DOCUMENT); gen.fRootFolderId = getRootFolderId(binding, repoId, rootFolderId); gen.fCount = noDocuments; runners[i] = gen; @@ -188,7 +188,7 @@ public class MultiThreadedObjectGenerato ObjectGenerator objGen = createObjectGenerator(provider, repoId, 0, 0, 0, null, folderType, 0, rootFolderId, null, doCleanup); - ObjectGeneratorRunner gen = new ObjectGeneratorRunner(objGen, Action.CreateFolders); + ObjectGeneratorRunner gen = new ObjectGeneratorRunner(objGen, Action.CREATE_FOLDERS); gen.fRootFolderId = getRootFolderId(provider, repoId, rootFolderId); gen.fCount = noFolders; return gen; @@ -202,7 +202,7 @@ public class MultiThreadedObjectGenerato ObjectGenerator objGen = createObjectGenerator(binding, repoId, 0, 0, 0, null, folderType, 0, rootFolderId, null, doCleanup); - ObjectGeneratorRunner gen = new ObjectGeneratorRunner(objGen, Action.CreateFolders); + ObjectGeneratorRunner gen = new ObjectGeneratorRunner(objGen, Action.CREATE_FOLDERS); gen.fRootFolderId = getRootFolderId(binding, repoId, rootFolderId); gen.fCount = noFolders; runners[i] = gen; @@ -210,12 +210,12 @@ public class MultiThreadedObjectGenerato return runners; } - public static ObjectGeneratorRunner prepareForCreateTypes(CmisBinding provider, String repoId, TypeDefinitionList typeDefList) { + public static ObjectGeneratorRunner prepareForCreateTypes(CmisBinding provider, String repoId, + TypeDefinitionList typeDefList) { - ObjectGenerator objGen = createObjectGenerator(provider, repoId, 0, 0, 0, null, null, 0, null, - null, false); + ObjectGenerator objGen = createObjectGenerator(provider, repoId, 0, 0, 0, null, null, 0, null, null, false); - ObjectGeneratorRunner gen = new ObjectGeneratorRunner(objGen, Action.CreateTypes); + ObjectGeneratorRunner gen = new ObjectGeneratorRunner(objGen, Action.CREATE_TYPES); gen.fTypeDefList = typeDefList; return gen; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java Thu Aug 13 12:05:59 2015 @@ -82,7 +82,7 @@ public class ObjectGenerator { */ public enum ContentKind { STATIC_TEXT, LOREM_IPSUM_TEXT, LOREM_IPSUM_HTML, IMAGE_FRACTAL_JPEG - }; + } /** * Indicates if / how many documents are created in each folder Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AbstractSpringLoginTab.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AbstractSpringLoginTab.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AbstractSpringLoginTab.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AbstractSpringLoginTab.java Thu Aug 13 12:05:59 2015 @@ -28,6 +28,7 @@ import javax.swing.JPasswordField; import javax.swing.JTextField; import javax.swing.Spring; import javax.swing.SpringLayout; +import javax.swing.SwingConstants; /** * Convenience methods for spring layout tabs. @@ -38,7 +39,7 @@ public abstract class AbstractSpringLogi protected JTextField createTextField(Container pane, String label) { JTextField textField = new JTextField(60); - JLabel textLabel = new JLabel(label, JLabel.TRAILING); + JLabel textLabel = new JLabel(label, SwingConstants.TRAILING); textLabel.setLabelFor(textField); pane.add(textLabel); @@ -50,7 +51,7 @@ public abstract class AbstractSpringLogi protected JFormattedTextField createIntegerField(Container pane, String label) { NumberFormat format = NumberFormat.getIntegerInstance(); JFormattedTextField intField = new JFormattedTextField(format); - JLabel intLabel = new JLabel(label, JLabel.TRAILING); + JLabel intLabel = new JLabel(label, SwingConstants.TRAILING); intLabel.setLabelFor(intField); pane.add(intLabel); @@ -61,7 +62,7 @@ public abstract class AbstractSpringLogi protected JPasswordField createPasswordField(Container pane, String label) { JPasswordField textField = new JPasswordField(60); - JLabel textLabel = new JLabel(label, JLabel.TRAILING); + JLabel textLabel = new JLabel(label, SwingConstants.TRAILING); textLabel.setLabelFor(textField); pane.add(textLabel); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AclEditorFrame.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AclEditorFrame.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AclEditorFrame.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AclEditorFrame.java Thu Aug 13 12:05:59 2015 @@ -53,6 +53,7 @@ import javax.swing.JSeparator; import javax.swing.JSplitPane; import javax.swing.SwingConstants; import javax.swing.UIManager; +import javax.swing.WindowConstants; import javax.swing.text.JTextComponent; import org.apache.chemistry.opencmis.client.api.CmisObject; @@ -220,6 +221,7 @@ public class AclEditorFrame extends JFra updateButton.setBorder(WorkbenchScale.scaleBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5))); updateButton.setDefaultCapable(true); updateButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { if (doApply()) { dispose(); @@ -229,7 +231,7 @@ public class AclEditorFrame extends JFra add(updateButton, BorderLayout.PAGE_END); - setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); pack(); setLocationRelativeTo(null); setVisible(true); @@ -256,6 +258,7 @@ public class AclEditorFrame extends JFra final JButton addButton = new JButton(ICON_ADD); addButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { list.addNewAce(); } @@ -448,6 +451,7 @@ public class AclEditorFrame extends JFra JButton removeButton = new JButton(ICON_REMOVE); removeButton.setDisabledIcon(ICON_REMOVE_DISABLED); removeButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { list.removeAce(getPosition()); } @@ -470,6 +474,7 @@ public class AclEditorFrame extends JFra }); editor.addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ENTER || e.getKeyCode() == KeyEvent.VK_TAB) { updatePermissionsPanel(true); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/BasicLoginTab.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/BasicLoginTab.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/BasicLoginTab.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/BasicLoginTab.java Thu Aug 13 12:05:59 2015 @@ -33,6 +33,7 @@ import javax.swing.JPasswordField; import javax.swing.JRadioButton; import javax.swing.JTextField; import javax.swing.SpringLayout; +import javax.swing.SwingConstants; import org.apache.chemistry.opencmis.commons.enums.BindingType; import org.apache.chemistry.opencmis.workbench.model.ClientSession; @@ -139,7 +140,7 @@ public class BasicLoginTab extends Abstr bindingContainer.add(bindingWebServicesButton); bindingContainer.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(10, 0)))); bindingContainer.add(bindingBrowserButton); - JLabel bindingLabel = new JLabel("Binding:", JLabel.TRAILING); + JLabel bindingLabel = new JLabel("Binding:", SwingConstants.TRAILING); pane.add(bindingLabel); pane.add(bindingContainer); @@ -169,7 +170,7 @@ public class BasicLoginTab extends Abstr authenticationContainer.add(authenticationNTLMButton); authenticationContainer.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(10, 0)))); authenticationContainer.add(authenticationOAuthButton); - JLabel authenticatioLabel = new JLabel("Authentication:", JLabel.TRAILING); + JLabel authenticatioLabel = new JLabel("Authentication:", SwingConstants.TRAILING); pane.add(authenticatioLabel); pane.add(authenticationContainer); @@ -187,7 +188,7 @@ public class BasicLoginTab extends Abstr compressionContainer.add(compressionOnButton); compressionContainer.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(10, 0)))); compressionContainer.add(compressionOffButton); - JLabel compressionLabel = new JLabel("Compression:", JLabel.TRAILING); + JLabel compressionLabel = new JLabel("Compression:", SwingConstants.TRAILING); pane.add(compressionLabel); pane.add(compressionContainer); @@ -205,7 +206,7 @@ public class BasicLoginTab extends Abstr clientCompressionContainer.add(clientCompressionOnButton); clientCompressionContainer.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(10, 0)))); clientCompressionContainer.add(clientCompressionOffButton); - JLabel clientCompressionLabel = new JLabel("Client Compression:", JLabel.TRAILING); + JLabel clientCompressionLabel = new JLabel("Client Compression:", SwingConstants.TRAILING); pane.add(clientCompressionLabel); pane.add(clientCompressionContainer); @@ -223,7 +224,7 @@ public class BasicLoginTab extends Abstr cookiesContainer.add(cookiesOnButton); cookiesContainer.add(Box.createRigidArea(WorkbenchScale.scaleDimension(new Dimension(10, 0)))); cookiesContainer.add(cookiesOffButton); - JLabel cookiesLabel = new JLabel("Cookies:", JLabel.TRAILING); + JLabel cookiesLabel = new JLabel("Cookies:", SwingConstants.TRAILING); pane.add(cookiesLabel); pane.add(cookiesContainer); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ChangeLogFrame.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ChangeLogFrame.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ChangeLogFrame.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ChangeLogFrame.java Thu Aug 13 12:05:59 2015 @@ -36,6 +36,7 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.JTextField; +import javax.swing.WindowConstants; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableColumn; @@ -122,7 +123,7 @@ public class ChangeLogFrame extends JFra ClientHelper.installEscapeBinding(this, getRootPane(), true); - setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); pack(); setLocationRelativeTo(null); @@ -175,14 +176,17 @@ public class ChangeLogFrame extends JFra this.table = table; } + @Override public String getColumnName(int columnIndex) { return COLUMN_NAMES[columnIndex]; } + @Override public int getColumnCount() { return COLUMN_NAMES.length; } + @Override public int getRowCount() { if (table.getChangeEvents() == null) { return 0; @@ -191,14 +195,15 @@ public class ChangeLogFrame extends JFra return table.getChangeEvents().size(); } + @Override public Object getValueAt(int rowIndex, int columnIndex) { ChangeEvent event = table.getChangeEvents().get(rowIndex); switch (columnIndex) { case 0: - return (event.getChangeType() == null ? "?" : event.getChangeType().value()); + return event.getChangeType() == null ? "?" : event.getChangeType().value(); case 1: - return (event.getObjectId() == null ? "?" : event.getObjectId()); + return event.getObjectId() == null ? "?" : event.getObjectId(); case 2: return event.getChangeTime(); case 3: Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientFrame.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientFrame.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientFrame.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientFrame.java Thu Aug 13 12:05:59 2015 @@ -44,6 +44,7 @@ import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.JSplitPane; import javax.swing.JToolBar; +import javax.swing.SwingConstants; import org.apache.chemistry.opencmis.commons.SessionParameter; import org.apache.chemistry.opencmis.workbench.ClientHelper.FileEntry; @@ -166,7 +167,7 @@ public class ClientFrame extends JFrame Container pane = getContentPane(); - toolBar = new JToolBar("CMIS Toolbar", JToolBar.HORIZONTAL); + toolBar = new JToolBar("CMIS Toolbar", SwingConstants.HORIZONTAL); toolbarButton = new JButton[10]; @@ -175,6 +176,7 @@ public class ClientFrame extends JFrame toolbarButton[BUTTON_CONNECT].setDisabledIcon(new ConnectIcon(ClientHelper.TOOLBAR_ICON_SIZE, ClientHelper.TOOLBAR_ICON_SIZE, false)); toolbarButton[BUTTON_CONNECT].addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { showLoginForm(); } @@ -190,6 +192,7 @@ public class ClientFrame extends JFrame ClientHelper.TOOLBAR_ICON_SIZE, false)); toolbarButton[BUTTON_REPOSITORY_INFO].setEnabled(false); toolbarButton[BUTTON_REPOSITORY_INFO].addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { new RepositoryInfoFrame(model); } @@ -203,6 +206,7 @@ public class ClientFrame extends JFrame ClientHelper.TOOLBAR_ICON_SIZE, false)); toolbarButton[BUTTON_TYPES].setEnabled(false); toolbarButton[BUTTON_TYPES].addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { new TypesFrame(model); } @@ -216,6 +220,7 @@ public class ClientFrame extends JFrame ClientHelper.TOOLBAR_ICON_SIZE, false)); toolbarButton[BUTTON_QUERY].setEnabled(false); toolbarButton[BUTTON_QUERY].addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { new QueryFrame(model); } @@ -229,6 +234,7 @@ public class ClientFrame extends JFrame ClientHelper.TOOLBAR_ICON_SIZE, false)); toolbarButton[BUTTON_CHANGELOG].setEnabled(false); toolbarButton[BUTTON_CHANGELOG].addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { new ChangeLogFrame(model); } @@ -242,6 +248,7 @@ public class ClientFrame extends JFrame ClientHelper.TOOLBAR_ICON_SIZE, false)); toolbarButton[BUTTON_CONSOLE].setEnabled(false); toolbarButton[BUTTON_CONSOLE].addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { toolbarConsolePopup.show(toolbarButton[BUTTON_CONSOLE], 0, toolbarButton[BUTTON_CONSOLE].getHeight()); } @@ -268,6 +275,7 @@ public class ClientFrame extends JFrame ClientHelper.TOOLBAR_ICON_SIZE, false)); toolbarButton[BUTTON_TCK].setEnabled(false); toolbarButton[BUTTON_TCK].addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { new TckDialog(thisFrame, model); } @@ -334,6 +342,7 @@ public class ClientFrame extends JFrame ClientHelper.TOOLBAR_ICON_SIZE, false)); toolbarButton[BUTTON_CREATE].setEnabled(false); toolbarButton[BUTTON_CREATE].addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { toolbarCreatePopup.show(toolbarButton[BUTTON_CREATE], 0, toolbarButton[BUTTON_CREATE].getHeight()); } @@ -348,6 +357,7 @@ public class ClientFrame extends JFrame toolbarButton[BUTTON_LOG].setDisabledIcon(new LogIcon(ClientHelper.TOOLBAR_ICON_SIZE, ClientHelper.TOOLBAR_ICON_SIZE, false)); toolbarButton[BUTTON_LOG].addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { logFrame.showFrame(); } @@ -360,6 +370,7 @@ public class ClientFrame extends JFrame toolbarButton[BUTTON_INFO].setDisabledIcon(new InfoIcon(ClientHelper.TOOLBAR_ICON_SIZE, ClientHelper.TOOLBAR_ICON_SIZE, false)); toolbarButton[BUTTON_INFO].addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { infoDialog.showDialog(); } @@ -468,9 +479,11 @@ public class ClientFrame extends JFrame return result; } + @Override public void windowOpened(WindowEvent e) { } + @Override public void windowClosing(WindowEvent e) { Point p = getLocation(); prefs.putInt(PREFS_X, p.x); @@ -480,18 +493,23 @@ public class ClientFrame extends JFrame prefs.putInt(PREFS_DIV, split.getDividerLocation()); } + @Override public void windowClosed(WindowEvent e) { } + @Override public void windowIconified(WindowEvent e) { } + @Override public void windowDeiconified(WindowEvent e) { } + @Override public void windowActivated(WindowEvent e) { } + @Override public void windowDeactivated(WindowEvent e) { } } Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientWriterAppender.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientWriterAppender.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientWriterAppender.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientWriterAppender.java Thu Aug 13 12:05:59 2015 @@ -41,6 +41,7 @@ public class ClientWriterAppender extend final String message = layout.format(loggingEvent); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { logTextArea.append(message); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ConnectionErrorDialog.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ConnectionErrorDialog.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ConnectionErrorDialog.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ConnectionErrorDialog.java Thu Aug 13 12:05:59 2015 @@ -35,9 +35,10 @@ import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JEditorPane; -import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JScrollPane; +import javax.swing.ScrollPaneConstants; +import javax.swing.WindowConstants; import javax.xml.stream.XMLStreamException; import org.apache.chemistry.opencmis.commons.exceptions.CmisConnectionException; @@ -101,8 +102,8 @@ public class ConnectionErrorDialog exten hints.setEditable(false); hints.setCaretPosition(0); - hintsPanel.add(new JScrollPane(hints, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER)); + hintsPanel.add(new JScrollPane(hints, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER)); // close button JPanel buttonPanel = new JPanel(); @@ -116,6 +117,7 @@ public class ConnectionErrorDialog exten closeButton.setAlignmentX(Component.CENTER_ALIGNMENT); closeButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { ConnectionErrorDialog.this.dispose(); } @@ -127,7 +129,7 @@ public class ConnectionErrorDialog exten ClientHelper.installEscapeBinding(this, getRootPane(), true); - setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); pack(); setLocationRelativeTo(getOwner()); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateDocumentDialog.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateDocumentDialog.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateDocumentDialog.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateDocumentDialog.java Thu Aug 13 12:05:59 2015 @@ -44,6 +44,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JTextField; +import javax.swing.SwingConstants; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; @@ -119,6 +120,7 @@ public class CreateDocumentDialog extend typeBox = new JComboBox<ObjectTypeItem>(types); typeBox.setSelectedIndex(0); typeBox.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { DocumentTypeDefinition type = (DocumentTypeDefinition) ((ObjectTypeItem) typeBox.getSelectedItem()) .getObjectType(); @@ -169,6 +171,7 @@ public class CreateDocumentDialog extend JButton browseButton = new JButton("Browse"); browseButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { JFileChooser fileChooser = new JFileChooser(); int chooseResult = fileChooser.showDialog(filenameField, "Select"); @@ -189,7 +192,7 @@ public class CreateDocumentDialog extend generateContentSizeField = new JFormattedTextField(NumberFormat.getIntegerInstance()); generateContentSizeField.setValue(0L); generateContentSizeField.setColumns(8); - generateContentSizeField.setHorizontalAlignment(JTextField.RIGHT); + generateContentSizeField.setHorizontalAlignment(SwingConstants.RIGHT); generateContentSizeField.setMaximumSize(generateContentSizeField.getPreferredSize()); generateContentPanel.add(generateContentSizeField); @@ -232,6 +235,7 @@ public class CreateDocumentDialog extend JButton createButton = new JButton("Create Document", new NewDocumentIcon(ClientHelper.BUTTON_ICON_SIZE, ClientHelper.BUTTON_ICON_SIZE)); createButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { String name = nameField.getText(); String type = ((ObjectTypeItem) typeBox.getSelectedItem()).getObjectType().getId(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateFolderDialog.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateFolderDialog.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateFolderDialog.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateFolderDialog.java Thu Aug 13 12:05:59 2015 @@ -65,6 +65,7 @@ public class CreateFolderDialog extends typeBox = new JComboBox<ObjectTypeItem>(types); typeBox.setSelectedIndex(0); typeBox.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { TypeDefinition type = ((ObjectTypeItem) typeBox.getSelectedItem()).getObjectType(); updateMandatoryFields(type); @@ -79,6 +80,7 @@ public class CreateFolderDialog extends JButton createButton = new JButton("Create Folder", new NewFolderIcon(ClientHelper.BUTTON_ICON_SIZE, ClientHelper.BUTTON_ICON_SIZE)); createButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { String name = nameField.getText(); String type = ((ObjectTypeItem) typeBox.getSelectedItem()).getObjectType().getId(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateItemDialog.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateItemDialog.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateItemDialog.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateItemDialog.java Thu Aug 13 12:05:59 2015 @@ -88,6 +88,7 @@ public class CreateItemDialog extends Cr typeBox = new JComboBox<ObjectTypeItem>(types); typeBox.setSelectedIndex(0); typeBox.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { TypeDefinition type = ((ObjectTypeItem) typeBox.getSelectedItem()).getObjectType(); updateMandatoryFields(type); @@ -102,6 +103,7 @@ public class CreateItemDialog extends Cr JButton createButton = new JButton("Create Item", new NewItemIcon(ClientHelper.BUTTON_ICON_SIZE, ClientHelper.BUTTON_ICON_SIZE)); createButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { String name = nameField.getText(); String type = ((ObjectTypeItem) typeBox.getSelectedItem()).getObjectType().getId(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreatePolicyDialog.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreatePolicyDialog.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreatePolicyDialog.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreatePolicyDialog.java Thu Aug 13 12:05:59 2015 @@ -89,6 +89,7 @@ public class CreatePolicyDialog extends typeBox = new JComboBox<ObjectTypeItem>(types); typeBox.setSelectedIndex(0); typeBox.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { TypeDefinition type = ((ObjectTypeItem) typeBox.getSelectedItem()).getObjectType(); updateMandatoryFields(type); @@ -106,6 +107,7 @@ public class CreatePolicyDialog extends JButton createButton = new JButton("Create Policy", new NewPolicyIcon(ClientHelper.BUTTON_ICON_SIZE, ClientHelper.BUTTON_ICON_SIZE)); createButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { String name = nameField.getText(); String policyText = policyTextField.getText(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateRelationshipDialog.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateRelationshipDialog.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateRelationshipDialog.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/CreateRelationshipDialog.java Thu Aug 13 12:05:59 2015 @@ -67,6 +67,7 @@ public class CreateRelationshipDialog ex typeBox = new JComboBox<ObjectTypeItem>(types); typeBox.setSelectedIndex(0); typeBox.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { TypeDefinition type = ((ObjectTypeItem) typeBox.getSelectedItem()).getObjectType(); updateMandatoryFields(type); @@ -90,6 +91,7 @@ public class CreateRelationshipDialog ex JButton createButton = new JButton("Create Relationship", new NewRelationshipIcon( ClientHelper.BUTTON_ICON_SIZE, ClientHelper.BUTTON_ICON_SIZE)); createButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { String name = nameField.getText(); String type = ((ObjectTypeItem) typeBox.getSelectedItem()).getObjectType().getId(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/DiscoverLoginTab.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/DiscoverLoginTab.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/DiscoverLoginTab.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/DiscoverLoginTab.java Thu Aug 13 12:05:59 2015 @@ -99,6 +99,7 @@ public class DiscoverLoginTab extends Ab add(new JScrollPane(authTable), BorderLayout.CENTER); ActionListener loadActionListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { try { setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); @@ -341,11 +342,11 @@ public class DiscoverLoginTab extends Ab case 0: return auth.getPreference(); case 1: - return (auth.getEndpoint().getCmisVersion() == null ? "?" : auth.getEndpoint().getCmisVersion()); + return auth.getEndpoint().getCmisVersion() == null ? "?" : auth.getEndpoint().getCmisVersion(); case 2: - return (auth.getEndpoint().getBinding() == null ? "?" : auth.getEndpoint().getBinding()); + return auth.getEndpoint().getBinding() == null ? "?" : auth.getEndpoint().getBinding(); case 3: - return (auth.getType() == null ? "?" : auth.getType()); + return auth.getType() == null ? "?" : auth.getType(); case 4: return auth; default: @@ -389,6 +390,7 @@ public class DiscoverLoginTab extends Ab return comp; } + @Override public void setValue(Object value) { StringBuilder text = new StringBuilder(128); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ExceptionDialog.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ExceptionDialog.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ExceptionDialog.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ExceptionDialog.java Thu Aug 13 12:05:59 2015 @@ -30,9 +30,10 @@ import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JEditorPane; -import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JScrollPane; +import javax.swing.ScrollPaneConstants; +import javax.swing.WindowConstants; import org.apache.chemistry.opencmis.commons.exceptions.CmisBaseException; @@ -92,8 +93,8 @@ public class ExceptionDialog extends JDi exceptionTextPane.setEditable(false); exceptionTextPane.setCaretPosition(0); - exceptionPanel.add(new JScrollPane(exceptionTextPane, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED)); + exceptionPanel.add(new JScrollPane(exceptionTextPane, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED)); // close button JPanel buttonPanel = new JPanel(); @@ -107,6 +108,7 @@ public class ExceptionDialog extends JDi closeButton.setAlignmentX(Component.CENTER_ALIGNMENT); closeButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { ExceptionDialog.this.dispose(); } @@ -118,7 +120,7 @@ public class ExceptionDialog extends JDi ClientHelper.installEscapeBinding(this, getRootPane(), true); - setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); pack(); setLocationRelativeTo(getOwner()); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ExpertLoginTab.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ExpertLoginTab.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ExpertLoginTab.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ExpertLoginTab.java Thu Aug 13 12:05:59 2015 @@ -80,6 +80,7 @@ public class ExpertLoginTab extends Abst } configs.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { if (e.getStateChange() == ItemEvent.SELECTED) { FileEntry fe = (FileEntry) e.getItem(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderPanel.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderPanel.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderPanel.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderPanel.java Thu Aug 13 12:05:59 2015 @@ -62,8 +62,10 @@ public class FolderPanel extends JPanel createGUI(); } + @Override public void folderLoaded(final ClientModelEvent event) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { Folder currentFolder = event.getClientModel().getCurrentFolder(); @@ -88,6 +90,7 @@ public class FolderPanel extends JPanel }); } + @Override public void objectLoaded(ClientModelEvent event) { int selectedRow = folderTable.getSelectedRow(); if (selectedRow > -1 && event.getClientModel().getCurrentObject() != null) { @@ -115,6 +118,7 @@ public class FolderPanel extends JPanel upButton = new JButton("up"); upButton.setEnabled(false); upButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { try { setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); @@ -132,15 +136,18 @@ public class FolderPanel extends JPanel pathField = new JTextField(""); pathField.addKeyListener(new KeyListener() { + @Override public void keyTyped(KeyEvent e) { } + @Override public void keyReleased(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ENTER) { loadFolder(); } } + @Override public void keyPressed(KeyEvent e) { } }); @@ -148,6 +155,7 @@ public class FolderPanel extends JPanel goButton = new JButton("go"); goButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { loadFolder(); } @@ -165,6 +173,7 @@ public class FolderPanel extends JPanel private void loadFolder() { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { try { setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderTable.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderTable.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderTable.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/FolderTable.java Thu Aug 13 12:05:59 2015 @@ -111,12 +111,14 @@ public class FolderTable extends JTable popup.add(menuItem); menuItem.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { ClientHelper.copyTableToClipboard(FolderTable.this); } }); getSelectionModel().addListSelectionListener(new ListSelectionListener() { + @Override public void valueChanged(ListSelectionEvent e) { if (e.getValueIsAdjusting()) { return; @@ -140,16 +142,19 @@ public class FolderTable extends JTable }); addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { if (e.getClickCount() == 2) { doAction(e.isShiftDown()); } } + @Override public void mousePressed(MouseEvent e) { maybeShowPopup(e); } + @Override public void mouseReleased(MouseEvent e) { maybeShowPopup(e); } @@ -162,15 +167,18 @@ public class FolderTable extends JTable }); addKeyListener(new KeyListener() { + @Override public void keyTyped(KeyEvent e) { } + @Override public void keyReleased(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_SPACE) { doAction(e.isShiftDown()); } } + @Override public void keyPressed(KeyEvent e) { } }); @@ -195,8 +203,10 @@ public class FolderTable extends JTable pwcIcon = new PwcIcon(ClientHelper.OBJECT_ICON_SIZE, ClientHelper.OBJECT_ICON_SIZE); } + @Override public void folderLoaded(final ClientModelEvent event) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { event.getClientModel().getCurrentChildren(); ((FolderTableModel) getModel()).fireTableDataChanged(); @@ -212,9 +222,9 @@ public class FolderTable extends JTable if (object instanceof Document) { if (alternate) { - ClientHelper.download(this.getParent(), (Document) object, null); + ClientHelper.download(this.getParent(), object, null); } else { - ClientHelper.open(this.getParent(), (Document) object, null); + ClientHelper.open(this.getParent(), object, null); } } else if (object instanceof Folder) { try { @@ -234,18 +244,22 @@ public class FolderTable extends JTable private static final long serialVersionUID = 1L; + @Override public String getColumnName(int columnIndex) { return COLUMN_NAMES[columnIndex]; } + @Override public int getColumnCount() { return COLUMN_NAMES.length; } + @Override public int getRowCount() { return model.getCurrentChildren().size(); } + @Override public Object getValueAt(int rowIndex, int columnIndex) { CmisObject obj = model.getCurrentChildren().get(rowIndex); @@ -387,14 +401,17 @@ public class FolderTable extends JTable final File tempTransFile = tempFile; return new Transferable() { + @Override public boolean isDataFlavorSupported(DataFlavor flavor) { return flavor == DataFlavor.javaFileListFlavor; } + @Override public DataFlavor[] getTransferDataFlavors() { return new DataFlavor[] { DataFlavor.javaFileListFlavor }; } + @Override public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException { return Collections.singletonList(tempTransFile); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/InfoDialog.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/InfoDialog.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/InfoDialog.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/InfoDialog.java Thu Aug 13 12:05:59 2015 @@ -31,12 +31,12 @@ import java.util.TreeSet; import javax.swing.BorderFactory; import javax.swing.BoxLayout; import javax.swing.JDialog; -import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.UIManager; +import javax.swing.WindowConstants; import org.apache.chemistry.opencmis.commons.impl.IOUtils; import org.apache.chemistry.opencmis.workbench.icons.CmisLogoIcon; @@ -96,7 +96,7 @@ public class InfoDialog extends JDialog ClientHelper.installEscapeBinding(this, getRootPane(), false); - setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); pack(); setLocationRelativeTo(null); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LogFrame.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LogFrame.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LogFrame.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LogFrame.java Thu Aug 13 12:05:59 2015 @@ -32,6 +32,7 @@ import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; +import javax.swing.WindowConstants; import org.apache.log4j.Level; import org.apache.log4j.Logger; @@ -71,6 +72,7 @@ public class LogFrame extends JFrame { JButton clearButton = new JButton("Clear"); clearButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { logTextArea.setText(""); } @@ -84,6 +86,7 @@ public class LogFrame extends JFrame { final JComboBox<String> levelBox = new JComboBox<String>(levels); levelBox.setSelectedItem(Logger.getRootLogger().getLevel().toString()); levelBox.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { Logger.getRootLogger().setLevel(Level.toLevel(levelBox.getSelectedItem().toString())); } @@ -92,7 +95,7 @@ public class LogFrame extends JFrame { ClientHelper.installEscapeBinding(this, getRootPane(), false); - setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); pack(); setLocationRelativeTo(null); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LoginDialog.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LoginDialog.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LoginDialog.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LoginDialog.java Thu Aug 13 12:05:59 2015 @@ -38,7 +38,6 @@ import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JDialog; -import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JOptionPane; @@ -46,6 +45,7 @@ import javax.swing.JPanel; import javax.swing.JTabbedPane; import javax.swing.ListCellRenderer; import javax.swing.UIManager; +import javax.swing.WindowConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -111,6 +111,7 @@ public class LoginDialog extends JDialog // listeners loadRepositoryButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { repositoryBox.removeAllItems(); @@ -170,6 +171,7 @@ public class LoginDialog extends JDialog }); loginButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { try { setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); @@ -199,7 +201,7 @@ public class LoginDialog extends JDialog ClientHelper.installEscapeBinding(this, getRootPane(), false); - setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); pack(); setLocationRelativeTo(null); } @@ -234,6 +236,7 @@ public class LoginDialog extends JDialog currentTab = (AbstractLoginTab) loginTabs.getSelectedComponent(); loginTabs.addChangeListener(new ChangeListener() { + @Override public void stateChanged(ChangeEvent e) { if (loginTabs.getSelectedComponent() == expertLoginTab) { if (currentTab.transferSessionParametersToExpertTab()) {
