diff --git a/org.rssowl.build/build-files/svn/SVNCLIENTADAPTER-LICENSE b/org.rssowl.build/build-files/svn/SVNCLIENTADAPTER-LICENSE deleted file mode 100644 index 831ab6eb..00000000 --- a/org.rssowl.build/build-files/svn/SVNCLIENTADAPTER-LICENSE +++ /dev/null @@ -1,185 +0,0 @@ -SVNClientAdapter Library License - -This license applies to all portions of SVNClientAdapter library, which -are not externally-maintained libraries (e.g. JavaHL or JavaSVN). - -Such libraries have their own licenses; we recommend you read them, as -their terms may differ from the terms below. - -============================================================================= - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/org.rssowl.build/build-files/svn/ganymed.jar b/org.rssowl.build/build-files/svn/ganymed.jar deleted file mode 100644 index e3bde26c..00000000 Binary files a/org.rssowl.build/build-files/svn/ganymed.jar and /dev/null differ diff --git a/org.rssowl.build/build-files/svn/svnClientAdapter.jar b/org.rssowl.build/build-files/svn/svnClientAdapter.jar deleted file mode 100644 index ed37ba46..00000000 Binary files a/org.rssowl.build/build-files/svn/svnClientAdapter.jar and /dev/null differ diff --git a/org.rssowl.build/build-files/svn/svnant.jar b/org.rssowl.build/build-files/svn/svnant.jar deleted file mode 100644 index 5b5d3ff2..00000000 Binary files a/org.rssowl.build/build-files/svn/svnant.jar and /dev/null differ diff --git a/org.rssowl.build/build-files/svn/svnjavahl.jar b/org.rssowl.build/build-files/svn/svnjavahl.jar deleted file mode 100644 index 71873057..00000000 Binary files a/org.rssowl.build/build-files/svn/svnjavahl.jar and /dev/null differ diff --git a/org.rssowl.build/build-files/svn/svnkit.jar b/org.rssowl.build/build-files/svn/svnkit.jar deleted file mode 100644 index 8fe3f414..00000000 Binary files a/org.rssowl.build/build-files/svn/svnkit.jar and /dev/null differ diff --git a/org.rssowl.core.tests/META-INF/MANIFEST.MF b/org.rssowl.core.tests/META-INF/MANIFEST.MF index 52ae7b29..b07fb4f5 100644 --- a/org.rssowl.core.tests/META-INF/MANIFEST.MF +++ b/org.rssowl.core.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests Plug-in Bundle-SymbolicName: org.rssowl.core.tests;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-Vendor: RSSOwl.org Require-Bundle: org.eclipse.core.runtime, org.rssowl.lib.jdom, diff --git a/org.rssowl.core.tests/src/org/rssowl/core/tests/NetworkTests.java b/org.rssowl.core.tests/src/org/rssowl/core/tests/NetworkTests.java index 795f9338..ce2d31ea 100644 --- a/org.rssowl.core.tests/src/org/rssowl/core/tests/NetworkTests.java +++ b/org.rssowl.core.tests/src/org/rssowl/core/tests/NetworkTests.java @@ -28,7 +28,6 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; import org.rssowl.core.tests.connection.ConnectionTests; -import org.rssowl.core.tests.connection.SyncConnectionTests; import org.rssowl.core.tests.controller.ControllerTestNetwork; /** @@ -40,7 +39,6 @@ @RunWith(Suite.class) @SuiteClasses({ ConnectionTests.class, - SyncConnectionTests.class, ControllerTestNetwork.class }) public class NetworkTests {} \ No newline at end of file diff --git a/org.rssowl.core.tests/src/org/rssowl/core/tests/connection/ConnectionTests.java b/org.rssowl.core.tests/src/org/rssowl/core/tests/connection/ConnectionTests.java index 3e03e11e..dbdd04ea 100644 --- a/org.rssowl.core.tests/src/org/rssowl/core/tests/connection/ConnectionTests.java +++ b/org.rssowl.core.tests/src/org/rssowl/core/tests/connection/ConnectionTests.java @@ -37,6 +37,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Platform; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.rssowl.core.Owl; import org.rssowl.core.connection.AuthenticationRequiredException; @@ -667,6 +668,7 @@ public void testWebsite() throws Exception { * @throws Exception */ @Test + @Ignore public void testGoogleReaderSync() throws Exception { String authToken = SyncUtils.getGoogleAuthToken("rssowl@mailinator.com", "rssowl.org", true, new NullProgressMonitor()); assertNotNull(authToken); diff --git a/org.rssowl.core.tests/src/org/rssowl/core/tests/ui/CleanUpTests.java b/org.rssowl.core.tests/src/org/rssowl/core/tests/ui/CleanUpTests.java index 8c03ffff..1cca7a96 100644 --- a/org.rssowl.core.tests/src/org/rssowl/core/tests/ui/CleanUpTests.java +++ b/org.rssowl.core.tests/src/org/rssowl/core/tests/ui/CleanUpTests.java @@ -28,6 +28,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.rssowl.core.Owl; import org.rssowl.core.internal.persist.service.PersistenceServiceImpl; @@ -974,6 +975,7 @@ public void testCleanUpNewsByAgeAndCount() throws Exception { * @throws Exception */ @Test + @Ignore public void testCleanUpBookmarksBySynchronization() throws Exception { IFolder rootFolder = fFactory.createFolder(null, null, "Root"); DynamicDAO.save(rootFolder); diff --git a/org.rssowl.core/META-INF/MANIFEST.MF b/org.rssowl.core/META-INF/MANIFEST.MF index 9ea8198c..90c60202 100644 --- a/org.rssowl.core/META-INF/MANIFEST.MF +++ b/org.rssowl.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.rssowl.core;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-Activator: org.rssowl.core.internal.Activator Eclipse-RegisterBuddy: org.rssowl.lib.db4o, org.rssowl.lib.httpclient Require-Bundle: org.eclipse.core.runtime, diff --git a/org.rssowl.core/src/org/rssowl/core/internal/interpreter/DublinCoreNamespaceHandler.java b/org.rssowl.core/src/org/rssowl/core/internal/interpreter/DublinCoreNamespaceHandler.java index e9f87863..20eea44a 100644 --- a/org.rssowl.core/src/org/rssowl/core/internal/interpreter/DublinCoreNamespaceHandler.java +++ b/org.rssowl.core/src/org/rssowl/core/internal/interpreter/DublinCoreNamespaceHandler.java @@ -91,6 +91,14 @@ else if (type instanceof INews) ((INews) type).setPublishDate(DateUtils.parseDate(element.getText())); } + /* Modified date */ + else if ("modified".equals(name)) { //$NON-NLS-1$ + if (type instanceof IFeed) + ((IFeed) type).setLastModifiedDate(DateUtils.parseDate(element.getText())); + else if (type instanceof INews) + ((INews) type).setModifiedDate(DateUtils.parseDate(element.getText())); + } + /* Creator */ else if ("creator".equals(name)) { //$NON-NLS-1$ IPerson person = Owl.getModelFactory().createPerson(null, type); diff --git a/org.rssowl.feature.eclipse/feature.xml b/org.rssowl.feature.eclipse/feature.xml index 78d49b77..fbee3a71 100644 --- a/org.rssowl.feature.eclipse/feature.xml +++ b/org.rssowl.feature.eclipse/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.rssowl.feature.tests/feature.xml b/org.rssowl.feature.tests/feature.xml index e9018393..2c1d8786 100644 --- a/org.rssowl.feature.tests/feature.xml +++ b/org.rssowl.feature.tests/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.rssowl.feature/feature.xml b/org.rssowl.feature/feature.xml index 38d4567c..6e815c0f 100644 --- a/org.rssowl.feature/feature.xml +++ b/org.rssowl.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.rssowl.lib.db4o/META-INF/MANIFEST.MF b/org.rssowl.lib.db4o/META-INF/MANIFEST.MF index 0e4b12c0..b537d04c 100644 --- a/org.rssowl.lib.db4o/META-INF/MANIFEST.MF +++ b/org.rssowl.lib.db4o/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.rssowl.lib.db4o -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Eclipse-BuddyPolicy: registered Bundle-Vendor: %Bundle-Vendor Export-Package: com.db4o, diff --git a/org.rssowl.lib.httpclient/META-INF/MANIFEST.MF b/org.rssowl.lib.httpclient/META-INF/MANIFEST.MF index 9abcced6..a174f5b8 100644 --- a/org.rssowl.lib.httpclient/META-INF/MANIFEST.MF +++ b/org.rssowl.lib.httpclient/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.rssowl.lib.httpclient -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Eclipse-BuddyPolicy: registered Export-Package: org.apache.commons.codec, org.apache.commons.codec.binary, diff --git a/org.rssowl.lib.jdom/META-INF/MANIFEST.MF b/org.rssowl.lib.jdom/META-INF/MANIFEST.MF index 3f7517c4..30eca937 100644 --- a/org.rssowl.lib.jdom/META-INF/MANIFEST.MF +++ b/org.rssowl.lib.jdom/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.rssowl.lib.jdom -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Eclipse-BuddyPolicy: registered Bundle-Vendor: %Bundle-Vendor Export-Package: ., diff --git a/org.rssowl.lib.lucene/META-INF/MANIFEST.MF b/org.rssowl.lib.lucene/META-INF/MANIFEST.MF index 21334d7e..9af125f4 100644 --- a/org.rssowl.lib.lucene/META-INF/MANIFEST.MF +++ b/org.rssowl.lib.lucene/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.rssowl.lib.lucene -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Export-Package: org.apache.lucene, org.apache.lucene.analysis, org.apache.lucene.analysis.standard, diff --git a/org.rssowl.ui/Launch RSSOwl 2.0.launch b/org.rssowl.ui/Launch RSSOwl 2.0.launch index b3d3f8c8..43776a21 100644 --- a/org.rssowl.ui/Launch RSSOwl 2.0.launch +++ b/org.rssowl.ui/Launch RSSOwl 2.0.launch @@ -1,4 +1,4 @@ - + @@ -11,7 +11,6 @@ - @@ -20,11 +19,12 @@ - - + + + diff --git a/org.rssowl.ui/META-INF/MANIFEST.MF b/org.rssowl.ui/META-INF/MANIFEST.MF index c4fa9536..623d693f 100644 --- a/org.rssowl.ui/META-INF/MANIFEST.MF +++ b/org.rssowl.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.rssowl.ui; singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.1.qualifier Bundle-Activator: org.rssowl.ui.internal.Activator Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.ui, diff --git a/org.rssowl.ui/about.ini b/org.rssowl.ui/about.ini index b68d1656..933da90c 100644 --- a/org.rssowl.ui/about.ini +++ b/org.rssowl.ui/about.ini @@ -7,8 +7,8 @@ # Property "aboutText" contains blurb for "About" dialog (translated) aboutText=RSSOwl\n\ \n\ -Version: 2.2.0\n\ -Build id: 2013-05-03\n\ +Version: 2.2.1\n\ +Build id: 2013-12-30\n\ \n\ (c) Copyright RSSOwl contributors and others 2005, 2011. All rights reserved.\n\ Visit http://www.rssowl.org\n\ diff --git a/org.rssowl.ui/config.ini b/org.rssowl.ui/config.ini index 43f73a98..f6a618be 100644 --- a/org.rssowl.ui/config.ini +++ b/org.rssowl.ui/config.ini @@ -32,10 +32,10 @@ eclipse.product=org.rssowl.ui.product osgi.instance.area.default=@user.home/.rssowl2 # The default configuration location -osgi.configuration.area=@user.home/.rssowl2/config220 +osgi.configuration.area=@user.home/.rssowl2/config221 # Version Information -rssowl.buildId=2.2.0 +rssowl.buildId=2.2.1 # End of file marker - must be here eof=eof \ No newline at end of file diff --git a/org.rssowl.ui/icons/obj16/fav_vimeo.png b/org.rssowl.ui/icons/obj16/fav_vimeo.png new file mode 100644 index 00000000..6c568da3 Binary files /dev/null and b/org.rssowl.ui/icons/obj16/fav_vimeo.png differ diff --git a/org.rssowl.ui/icons/obj16/mono_archive.gif b/org.rssowl.ui/icons/obj16/mono_archive.gif new file mode 100644 index 00000000..45948a0c Binary files /dev/null and b/org.rssowl.ui/icons/obj16/mono_archive.gif differ diff --git a/org.rssowl.ui/icons/obj16/mono_label.gif b/org.rssowl.ui/icons/obj16/mono_label.gif new file mode 100644 index 00000000..56d4b93d Binary files /dev/null and b/org.rssowl.ui/icons/obj16/mono_label.gif differ diff --git a/org.rssowl.ui/icons/obj16/mono_share.gif b/org.rssowl.ui/icons/obj16/mono_share.gif new file mode 100644 index 00000000..c3f9e1b0 Binary files /dev/null and b/org.rssowl.ui/icons/obj16/mono_share.gif differ diff --git a/org.rssowl.ui/icons/obj16/mono_sticky.gif b/org.rssowl.ui/icons/obj16/mono_sticky.gif new file mode 100644 index 00000000..3face72c Binary files /dev/null and b/org.rssowl.ui/icons/obj16/mono_sticky.gif differ diff --git a/org.rssowl.ui/pack200jars.bat b/org.rssowl.ui/pack200jars.bat index 90f636a4..506020ea 100644 --- a/org.rssowl.ui/pack200jars.bat +++ b/org.rssowl.ui/pack200jars.bat @@ -35,12 +35,12 @@ del *.pack "C:\Program Files\Java\jdk1.5.0_22\bin\pack200" -g -G org.eclipse.update.core_3.2.202.R34x_v20081128.jar.pack org.eclipse.update.core_3.2.202.R34x_v20081128.jar "C:\Program Files\Java\jdk1.5.0_22\bin\pack200" -g -G org.eclipse.update.ui_3.2.101.R34x_v20081128.jar.pack org.eclipse.update.ui_3.2.101.R34x_v20081128.jar -"C:\Program Files\Java\jdk1.5.0_22\bin\pack200" -g org.rssowl.core_2.1.6.201212081830.jar.pack org.rssowl.core_2.1.6.201212081830.jar -"C:\Program Files\Java\jdk1.5.0_22\bin\pack200" -g org.rssowl.lib.db4o_2.1.6.201212081830.jar.pack org.rssowl.lib.db4o_2.1.6.201212081830.jar -"C:\Program Files\Java\jdk1.5.0_22\bin\pack200" -g org.rssowl.lib.httpclient_2.1.6.201212081830.jar.pack org.rssowl.lib.httpclient_2.1.6.201212081830.jar -"C:\Program Files\Java\jdk1.5.0_22\bin\pack200" -g org.rssowl.lib.jdom_2.1.6.201212081830.jar.pack org.rssowl.lib.jdom_2.1.6.201212081830.jar -"C:\Program Files\Java\jdk1.5.0_22\bin\pack200" -g org.rssowl.lib.lucene_2.1.6.201212081830.jar.pack org.rssowl.lib.lucene_2.1.6.201212081830.jar -"C:\Program Files\Java\jdk1.5.0_22\bin\pack200" -g org.rssowl.ui_2.1.6.201212081830.jar.pack org.rssowl.ui_2.1.6.201212081830.jar +"C:\Program Files\Java\jdk1.5.0_22\bin\pack200" -g org.rssowl.core_2.2.1.201312301314.jar.pack org.rssowl.core_2.2.1.201312301314.jar +"C:\Program Files\Java\jdk1.5.0_22\bin\pack200" -g org.rssowl.lib.db4o_2.2.1.201312301314.jar.pack org.rssowl.lib.db4o_2.2.1.201312301314.jar +"C:\Program Files\Java\jdk1.5.0_22\bin\pack200" -g org.rssowl.lib.httpclient_2.2.1.201312301314.jar.pack org.rssowl.lib.httpclient_2.2.1.201312301314.jar +"C:\Program Files\Java\jdk1.5.0_22\bin\pack200" -g org.rssowl.lib.jdom_2.2.1.201312301314.jar.pack org.rssowl.lib.jdom_2.2.1.201312301314.jar +"C:\Program Files\Java\jdk1.5.0_22\bin\pack200" -g org.rssowl.lib.lucene_2.2.1.201312301314.jar.pack org.rssowl.lib.lucene_2.2.1.201312301314.jar +"C:\Program Files\Java\jdk1.5.0_22\bin\pack200" -g org.rssowl.ui_2.2.1.201312301314.jar.pack org.rssowl.ui_2.2.1.201312301314.jar del com.ibm.icu.base_3.8.1.v20080530.jar del org.eclipse.core.commands_3.4.0.I20080509-2000.jar @@ -77,9 +77,9 @@ del org.eclipse.update.core.win32_3.2.100.v20080107.jar del org.eclipse.update.core_3.2.202.R34x_v20081128.jar del org.eclipse.update.ui_3.2.101.R34x_v20081128.jar -del org.rssowl.core_2.1.6.201212081830.jar -del org.rssowl.lib.db4o_2.1.6.201212081830.jar -del org.rssowl.lib.httpclient_2.1.6.201212081830.jar -del org.rssowl.lib.jdom_2.1.6.201212081830.jar -del org.rssowl.lib.lucene_2.1.6.201212081830.jar -del org.rssowl.ui_2.1.6.201212081830.jar \ No newline at end of file +del org.rssowl.core_2.2.1.201312301314.jar +del org.rssowl.lib.db4o_2.2.1.201312301314.jar +del org.rssowl.lib.httpclient_2.2.1.201312301314.jar +del org.rssowl.lib.jdom_2.2.1.201312301314.jar +del org.rssowl.lib.lucene_2.2.1.201312301314.jar +del org.rssowl.ui_2.2.1.201312301314.jar \ No newline at end of file diff --git a/org.rssowl.ui/plugin.eclipse.properties b/org.rssowl.ui/plugin.eclipse.properties index 0b3af089..9fad7426 100644 --- a/org.rssowl.ui/plugin.eclipse.properties +++ b/org.rssowl.ui/plugin.eclipse.properties @@ -223,6 +223,7 @@ keywordFeed.name.4 = T&witter keywordFeed.name.5 = Google &Blog keywordFeed.name.6 = &YouTube Video keywordFeed.name.7 = &Flickr Photo +keywordFeed.name.8 = &Vimeo Video newsAction.description = Shows matching News in the Notifier Pop-Up newsAction.name = Show News in Notifier newsAction.name.0 = Play a Sound diff --git a/org.rssowl.ui/plugin.eclipse.xml b/org.rssowl.ui/plugin.eclipse.xml index 10cb8524..89c8d174 100644 --- a/org.rssowl.ui/plugin.eclipse.xml +++ b/org.rssowl.ui/plugin.eclipse.xml @@ -756,7 +756,7 @@ value="icons/product/16x16.png,icons/product/32x32.png,icons/product/48x48.png,icons/product/64x64.png,icons/product/128x128.png"/> + value="RSSOwl Version: 2.2.1 Build Id: 2013-12-30 RSSOwl is licensed under the terms of the Eclipse Public License version 1.0. http://www.rssowl.org/legal/epl-v10.html (c) Copyright RSSOwl contributors and others 2005, 2011. All rights reserved."/> diff --git a/org.rssowl.ui/plugin.properties b/org.rssowl.ui/plugin.properties index 1ba86cb8..55c6159e 100644 --- a/org.rssowl.ui/plugin.properties +++ b/org.rssowl.ui/plugin.properties @@ -222,6 +222,7 @@ keywordFeed.name.4 = T&witter keywordFeed.name.5 = Google &Blog keywordFeed.name.6 = &YouTube Video keywordFeed.name.7 = &Flickr Photo +keywordFeed.name.8 = &Vimeo Video newsAction.description = Shows matching News in the Notifier Pop-Up newsAction.name = Show News in Notifier newsAction.name.0 = Play a Sound diff --git a/org.rssowl.ui/plugin.xml b/org.rssowl.ui/plugin.xml index 640577fa..54a8a8ac 100644 --- a/org.rssowl.ui/plugin.xml +++ b/org.rssowl.ui/plugin.xml @@ -968,7 +968,7 @@ value="icons/product/16x16.png,icons/product/32x32.png,icons/product/48x48.png,icons/product/64x64.png,icons/product/128x128.png"/> + value="RSSOwl Version: 2.2.1 Build Id: 2013-12-30 RSSOwl is licensed under the terms of the Eclipse Public License version 1.0. http://www.rssowl.org/legal/epl-v10.html (c) Copyright RSSOwl contributors and others 2005, 2011. All rights reserved."/> @@ -1681,12 +1681,6 @@ name="%keywordFeed.name" url="http://news.google.com/news?q=[:]&output=rss&num=25"> - - + url="http://digg.com/search/?q=[:]&format=rss"> + url="http://www.queryfeed.net/twitter?q=[:]"> + + diff --git a/org.rssowl.ui/rssowl.product b/org.rssowl.ui/rssowl.product index 06bd3676..f1814c89 100644 --- a/org.rssowl.ui/rssowl.product +++ b/org.rssowl.ui/rssowl.product @@ -1,15 +1,15 @@ - + RSSOwl -Version: 2.2.0 -Build Id: 2013-05-03 +Version: 2.2.1 +Build Id: 2013-12-30 RSSOwl is licensed under the terms of the Eclipse Public License version 1.0. http://www.rssowl.org/legal/epl-v10.html @@ -74,7 +74,7 @@ RSSOwl Development Team - initial API and implementation - + diff --git a/org.rssowl.ui/rssowl_installer.nsi b/org.rssowl.ui/rssowl_installer.nsi index 268082b1..ab930bf5 100644 --- a/org.rssowl.ui/rssowl_installer.nsi +++ b/org.rssowl.ui/rssowl_installer.nsi @@ -26,18 +26,18 @@ * The NSIS-Script to create the RSSOwl installer. * * @author bpasero - * @version 2.1 + * @version 2.2.1 */ ;##### Variables ###### -!define VER_DISPLAY "2.2.0" +!define VER_DISPLAY "2.2.1" ;##### Include Modern UI ###### !include "MUI.nsh" ;##### Installer Configuration ###### Name "RSSOwl" -OutFile "RSSOwl Setup 2.2.exe" +OutFile "RSSOwl Setup 2.2.1.exe" InstallDir $PROGRAMFILES\RSSOwl InstallDirRegKey HKCU "Software\RSSOwl" "" AllowRootDirInstall true @@ -265,23 +265,23 @@ Section "" DetailPrint "$(^Extract) org.eclipse.update.ui_3.2.101.R34x_v20081128.jar" nsExec::ExecToStack '"plugins\unpack200.exe" -r plugins\org.eclipse.update.ui_3.2.101.R34x_v20081128.jar.pack plugins\org.eclipse.update.ui_3.2.101.R34x_v20081128.jar' - DetailPrint "$(^Extract) org.rssowl.core_2.1.6.201212081830.jar" - nsExec::ExecToStack '"plugins\unpack200.exe" -r plugins\org.rssowl.core_2.1.6.201212081830.jar.pack plugins\org.rssowl.core_2.1.6.201212081830.jar' + DetailPrint "$(^Extract) org.rssowl.core_2.2.1.201312301314.jar" + nsExec::ExecToStack '"plugins\unpack200.exe" -r plugins\org.rssowl.core_2.2.1.201312301314.jar.pack plugins\org.rssowl.core_2.2.1.201312301314.jar' - DetailPrint "$(^Extract) org.rssowl.lib.db4o_2.1.6.201212081830.jar" - nsExec::ExecToStack '"plugins\unpack200.exe" -r plugins\org.rssowl.lib.db4o_2.1.6.201212081830.jar.pack plugins\org.rssowl.lib.db4o_2.1.6.201212081830.jar' + DetailPrint "$(^Extract) org.rssowl.lib.db4o_2.2.1.201312301314.jar" + nsExec::ExecToStack '"plugins\unpack200.exe" -r plugins\org.rssowl.lib.db4o_2.2.1.201312301314.jar.pack plugins\org.rssowl.lib.db4o_2.2.1.201312301314.jar' - DetailPrint "$(^Extract) org.rssowl.lib.httpclient_2.1.6.201212081830.jar" - nsExec::ExecToStack '"plugins\unpack200.exe" -r plugins\org.rssowl.lib.httpclient_2.1.6.201212081830.jar.pack plugins\org.rssowl.lib.httpclient_2.1.6.201212081830.jar' + DetailPrint "$(^Extract) org.rssowl.lib.httpclient_2.2.1.201312301314.jar" + nsExec::ExecToStack '"plugins\unpack200.exe" -r plugins\org.rssowl.lib.httpclient_2.2.1.201312301314.jar.pack plugins\org.rssowl.lib.httpclient_2.2.1.201312301314.jar' - DetailPrint "$(^Extract) org.rssowl.lib.jdom_2.1.6.201212081830.jar" - nsExec::ExecToStack '"plugins\unpack200.exe" -r plugins\org.rssowl.lib.jdom_2.1.6.201212081830.jar.pack plugins\org.rssowl.lib.jdom_2.1.6.201212081830.jar' + DetailPrint "$(^Extract) org.rssowl.lib.jdom_2.2.1.201312301314.jar" + nsExec::ExecToStack '"plugins\unpack200.exe" -r plugins\org.rssowl.lib.jdom_2.2.1.201312301314.jar.pack plugins\org.rssowl.lib.jdom_2.2.1.201312301314.jar' - DetailPrint "$(^Extract) org.rssowl.lib.lucene_2.1.6.201212081830.jar" - nsExec::ExecToStack '"plugins\unpack200.exe" -r plugins\org.rssowl.lib.lucene_2.1.6.201212081830.jar.pack plugins\org.rssowl.lib.lucene_2.1.6.201212081830.jar' + DetailPrint "$(^Extract) org.rssowl.lib.lucene_2.2.1.201312301314.jar" + nsExec::ExecToStack '"plugins\unpack200.exe" -r plugins\org.rssowl.lib.lucene_2.2.1.201312301314.jar.pack plugins\org.rssowl.lib.lucene_2.2.1.201312301314.jar' - DetailPrint "$(^Extract) org.rssowl.ui_2.1.6.201212081830.jar" - nsExec::ExecToStack '"plugins\unpack200.exe" -r plugins\org.rssowl.ui_2.1.6.201212081830.jar.pack plugins\org.rssowl.ui_2.1.6.201212081830.jar' + DetailPrint "$(^Extract) org.rssowl.ui_2.2.1.201312301314.jar" + nsExec::ExecToStack '"plugins\unpack200.exe" -r plugins\org.rssowl.ui_2.2.1.201312301314.jar.pack plugins\org.rssowl.ui_2.2.1.201312301314.jar' Delete "$INSTDIR\plugins\unpack200.exe" diff --git a/org.rssowl.ui/src/org/rssowl/ui/internal/SplashHandler.java b/org.rssowl.ui/src/org/rssowl/ui/internal/SplashHandler.java index d2a0ddb8..6542ae19 100644 --- a/org.rssowl.ui/src/org/rssowl/ui/internal/SplashHandler.java +++ b/org.rssowl.ui/src/org/rssowl/ui/internal/SplashHandler.java @@ -94,7 +94,7 @@ private void initComponents(Shell shell) { versionLabel.setLayoutData(new GridData(SWT.END, SWT.BEGINNING, true, false)); versionLabel.setFont(fVersionFont); versionLabel.setForeground(fVersionColor); - versionLabel.setText(NLS.bind(Messages.SplashHandler_BUILD, "2.2")); //$NON-NLS-1$ + versionLabel.setText(NLS.bind(Messages.SplashHandler_BUILD, "2.2.1")); //$NON-NLS-1$ /* Layout All */ shell.layout(true, true); diff --git a/org.rssowl.ui/src/org/rssowl/ui/internal/editors/feed/NewsBrowserLabelProvider.java b/org.rssowl.ui/src/org/rssowl/ui/internal/editors/feed/NewsBrowserLabelProvider.java index 7d935bd5..5f96ccd6 100644 --- a/org.rssowl.ui/src/org/rssowl/ui/internal/editors/feed/NewsBrowserLabelProvider.java +++ b/org.rssowl.ui/src/org/rssowl/ui/internal/editors/feed/NewsBrowserLabelProvider.java @@ -141,6 +141,10 @@ enum Dynamic { HEADER("header"), //$NON-NLS-1$ CONTENT("content"), //$NON-NLS-1$ FOOTER("footer"), //$NON-NLS-1$ + FOOTER_STICKY_LINK("footerStickyLink"), //$NON-NLS-1$ + FOOTER_ARCHIVE_LINK("footerArchiveLink"), //$NON-NLS-1$ + FOOTER_LABEL_MENU_LINK("footerLabelMenuLink"), //$NON-NLS-1$ + FOOTER_SHARE_MENU_LINK("footerShareMenuLink"), //$NON-NLS-1$ FIND_RELATED_MENU_LINK("findRelatedMenuLink"), //$NON-NLS-1$ FOOTER_NEWS_MENU_LINK("footerNewsMenuLink"), //$NON-NLS-1$ ATTACHMENTS_MENU_LINK("attachmentsMenuLink"), //$NON-NLS-1$ @@ -1119,9 +1123,49 @@ String getLabel(INews news, boolean withInternalLinks, boolean withManagedLinks, builder.append(""); //$NON-NLS-1$ } + /* Mark Sticky */ + builder.append(""); //$NON-NLS-1$ + String link = HANDLER_PROTOCOL + TOGGLE_STICKY_HANDLER_ID + "?" + news.getId(); //$NON-NLS-1$ + imageLink(builder, link, Messages.NewsBrowserLabelProvider_STICKY, Messages.NewsBrowserLabelProvider_STICKY, null, "/icons/obj16/mono_sticky.gif", "mono_sticky.gif", Dynamic.FOOTER_STICKY_LINK.getId(news), null, null); //$NON-NLS-1$ //$NON-NLS-2$ + builder.append(""); //$NON-NLS-1$ + + builder.append(""); //$NON-NLS-1$ + builder.append("|"); //$NON-NLS-1$ + builder.append(""); //$NON-NLS-1$ + + /* Apply Label */ + builder.append(""); //$NON-NLS-1$ + link = HANDLER_PROTOCOL + LABELS_MENU_HANDLER_ID + "?" + news.getId(); //$NON-NLS-1$ + imageLink(builder, link, Messages.NewsBrowserLabelProvider_LABEL, Messages.NewsBrowserLabelProvider_LABEL, null, "/icons/obj16/mono_label.gif", "mono_label.gif", Dynamic.FOOTER_LABEL_MENU_LINK.getId(news), null, null); //$NON-NLS-1$ //$NON-NLS-2$ + builder.append(""); //$NON-NLS-1$ + + builder.append(""); //$NON-NLS-1$ + builder.append("|"); //$NON-NLS-1$ + builder.append(""); //$NON-NLS-1$ + + /* Archive */ + builder.append(""); //$NON-NLS-1$ + link = HANDLER_PROTOCOL + ARCHIVE_HANDLER_ID + "?" + news.getId(); //$NON-NLS-1$ + imageLink(builder, link, Messages.NewsBrowserLabelProvider_ARCHIVE, Messages.NewsBrowserLabelProvider_ARCHIVE_NEWS, null, "/icons/obj16/mono_archive.gif", "mono_archive.gif", Dynamic.FOOTER_ARCHIVE_LINK.getId(news), null, null); //$NON-NLS-1$ //$NON-NLS-2$ + builder.append(""); //$NON-NLS-1$ + + builder.append(""); //$NON-NLS-1$ + builder.append("|"); //$NON-NLS-1$ + builder.append(""); //$NON-NLS-1$ + + /* Share Menu */ + builder.append(""); //$NON-NLS-1$ + link = HANDLER_PROTOCOL + SHARE_NEWS_MENU_HANDLER_ID + "?" + news.getId(); //$NON-NLS-1$ + imageLink(builder, link, Messages.NewsBrowserLabelProvider_SHARE, Messages.NewsBrowserLabelProvider_SHARE_NEWS, null, "/icons/obj16/mono_share.gif", "mono_share.gif", Dynamic.FOOTER_SHARE_MENU_LINK.getId(news), null, null); //$NON-NLS-1$ //$NON-NLS-2$ + builder.append(""); //$NON-NLS-1$ + + builder.append(""); //$NON-NLS-1$ + builder.append("|"); //$NON-NLS-1$ + builder.append(""); //$NON-NLS-1$ + /* News Menu */ builder.append(""); //$NON-NLS-1$ - String link = HANDLER_PROTOCOL + NEWS_MENU_HANDLER_ID + "?" + news.getId(); //$NON-NLS-1$ + link = HANDLER_PROTOCOL + NEWS_MENU_HANDLER_ID + "?" + news.getId(); //$NON-NLS-1$ imageLink(builder, link, Messages.NewsBrowserLabelProvider_MENU, Messages.NewsBrowserLabelProvider_NEWS_MENU, null, "/icons/obj16/mono_menu.gif", "mono_menu.gif", Dynamic.FOOTER_NEWS_MENU_LINK.getId(news), null, null); //$NON-NLS-1$ //$NON-NLS-2$ builder.append(""); //$NON-NLS-1$ diff --git a/org.rssowl.ui/src/org/rssowl/ui/internal/editors/feed/messages.properties b/org.rssowl.ui/src/org/rssowl/ui/internal/editors/feed/messages.properties index 8e48f082..451e7171 100644 --- a/org.rssowl.ui/src/org/rssowl/ui/internal/editors/feed/messages.properties +++ b/org.rssowl.ui/src/org/rssowl/ui/internal/editors/feed/messages.properties @@ -60,7 +60,7 @@ NewsBrowserLabelProvider_NO_CONTENT=This article does not provide any content. NewsBrowserLabelProvider_ONE_ARTICLE=(1 Article) NewsBrowserLabelProvider_ONE_ARTICLE_N_FILTERED=(1 Article, {0} Filtered) NewsBrowserLabelProvider_READ_COMMENTS=Read Comments -NewsBrowserLabelProvider_RELATED_NEWS=Related News +NewsBrowserLabelProvider_RELATED_NEWS=Related NewsBrowserLabelProvider_SEARCH_FOR_RELATED_NEWS=Search for Related News NewsBrowserLabelProvider_SHARE=Share NewsBrowserLabelProvider_SHARE_NEWS=Share News diff --git a/org.rssowl.update.sites/eclipse/site.xml b/org.rssowl.update.sites/eclipse/site.xml index deb28ff0..54447bd8 100644 --- a/org.rssowl.update.sites/eclipse/site.xml +++ b/org.rssowl.update.sites/eclipse/site.xml @@ -1,6 +1,6 @@ - + diff --git a/org.rssowl.update.sites/nightly/site.xml b/org.rssowl.update.sites/nightly/site.xml index a9826a27..7f7fa458 100644 --- a/org.rssowl.update.sites/nightly/site.xml +++ b/org.rssowl.update.sites/nightly/site.xml @@ -1,6 +1,6 @@ - + diff --git a/org.rssowl.update.sites/program/site.xml b/org.rssowl.update.sites/program/site.xml index 92dde052..8d712a76 100644 --- a/org.rssowl.update.sites/program/site.xml +++ b/org.rssowl.update.sites/program/site.xml @@ -3,7 +3,7 @@ The main update site of RSSOwl. - +