lib/bbutilities.jar @@ -411,6 +411,7 @@ public class SyncIn extends AbstractSynchronization localFeed.setCustomViewModeEnabled(remoteFeed.isCustomViewModeEnabled()); localFeed.setRating(remoteFeed.getRating()); localFeed.setType(remoteFeed.getType()); + localFeed.setHandlingType(remoteFeed.getHandlingType()); // Feed type specific operations if (localFeed instanceof DirectFeed) src/com/salas/bb/service/sync/SyncIn.java @@ -206,10 +206,12 @@ public final class Converter boolean viewModeEnabled = aFeed.isCustomViewModeEnabled(); int viewMode = aFeed.getCustomViewMode(); + int handlingType = aFeed.getHandlingType().toInteger(); + opmlFeed = new DirectOPMLFeed(title, xmlURL, htmlURL, rating, readArticlesKeys, pinnedArticlesKeys, purgeLimit, customTitle, customAuthor, customDescription, tags, tagsDescription, tagsExtended, aFeed.isDisabled(), - viewType, viewModeEnabled, viewMode, aFeed.getAscendingSorting()); + viewType, viewModeEnabled, viewMode, aFeed.getAscendingSorting(), handlingType); fillDataFeedProperties(opmlFeed, aFeed); } @@ -261,7 +263,7 @@ public final class Converter opmlFeed = new QueryOPMLFeed(title, queryType, queryParam, xmlURL, readArticlesKeys, pinnedArticlesKeys, purgeLimit, rating, viewType, viewModeEnabled, viewMode, - aFeed.getAscendingSorting()); + aFeed.getAscendingSorting(), aFeed.getHandlingType().toInteger()); opmlFeed.setDedupEnabled(aFeed.isDedupEnabled()); opmlFeed.setDedupFrom(aFeed.getDedupFrom()); @@ -294,7 +296,7 @@ public final class Converter int viewMode = aFeed.getCustomViewMode(); SearchOPMLFeed feed = new SearchOPMLFeed(title, query.serializeToString(), articlesLimit, rating, - viewType, viewModeEnabled, viewMode, aFeed.getAscendingSorting()); + viewType, viewModeEnabled, viewMode, aFeed.getAscendingSorting(), aFeed.getHandlingType().toInteger()); feed.setDedupEnabled(aFeed.isDedupEnabled()); feed.setDedupFrom(aFeed.getDedupFrom()); src/com/salas/bb/utils/opml/Converter.java @@ -135,6 +135,7 @@ public final class Helper int viewMode = opmlFeed.getViewMode(); if (viewMode != -1) feed.setCustomViewMode(viewMode); + feed.setHandlingType(FeedHandlingType.toObject(opmlFeed.getHandlingType())); feed.setAscendingSorting(opmlFeed.getAscendingSorting()); } src/com/salas/bb/utils/opml/Helper.java @@ -486,7 +486,8 @@ public final class Poller implements Runnable QueryFeed qFeed = Helper.createQueryFeed((QueryOPMLFeed)feed); feed = new DirectOPMLFeed(feed.getTitle(), qFeed.getXmlURL().toString(), null, feed.getRating(), feed.getReadArticlesKeys(), feed.getPinnedArticlesKeys(), feed.getLimit(), - null, null, null, null, null, null, false, qFeed.getType().getType(), false, 0, null); + null, null, null, null, null, null, false, qFeed.getType().getType(), false, 0, null, + qFeed.getHandlingType().toInteger()); } if (feed instanceof DirectOPMLFeed) src/com/salas/bb/utils/poller/Poller.java @@ -69,7 +69,7 @@ public class TestImportGuidesAction extends TestCase final OPMLGuide guide1 = new OPMLGuide("guide1", null, false, null, null, false, 0, false, false, false); final ArrayList<DefaultOPMLFeed> al1 = new ArrayList<DefaultOPMLFeed>(); - al1.add(new DirectOPMLFeed("1", "1", "1", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false)); + al1.add(new DirectOPMLFeed("1", "1", "1", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false, 0)); guide1.setFeeds(al1); final OPMLGuide[] guides = {emptyGuide, guide1}; @@ -91,14 +91,14 @@ public class TestImportGuidesAction extends TestCase g1 = new OPMLGuide("g1", "icon1", false, null, null, false, 0, false, false, false); a1 = new ArrayList<DefaultOPMLFeed>(); - a1.add(new DirectOPMLFeed("1", "file://1", "file://1", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false)); - a1.add(new DirectOPMLFeed("2", "file://2", "file://2", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false)); + a1.add(new DirectOPMLFeed("1", "file://1", "file://1", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false, 0)); + a1.add(new DirectOPMLFeed("2", "file://2", "file://2", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false, 0)); g1.setFeeds(a1); g2 = new OPMLGuide("g2", null, false, null, null, false, 0, false, false, false); a2 = new ArrayList<DefaultOPMLFeed>(); - a2.add(new DirectOPMLFeed("3", "file://3", "file://3", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false)); - a2.add(new DirectOPMLFeed("4", "file://4", "file://4", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false)); + a2.add(new DirectOPMLFeed("3", "file://3", "file://3", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false, 0)); + a2.add(new DirectOPMLFeed("4", "file://4", "file://4", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false, 0)); g2.setFeeds(a2); final OPMLGuide[] guides = {g1, g2}; @@ -173,14 +173,14 @@ public class TestImportGuidesAction extends TestCase g1 = new OPMLGuide("g1", "icon1", false, null, null, false, 0, false, false, false); a1 = new ArrayList<DefaultOPMLFeed>(); - a1.add(new DirectOPMLFeed("1", "file://1", "file://1", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false)); - a1.add(new DirectOPMLFeed("2", "file://2", "file://2", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false)); + a1.add(new DirectOPMLFeed("1", "file://1", "file://1", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false, 0)); + a1.add(new DirectOPMLFeed("2", "file://2", "file://2", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false, 0)); g1.setFeeds(a1); g2 = new OPMLGuide("g1", null, false, null, null, false, 0, false, false, false); a2 = new ArrayList<DefaultOPMLFeed>(); - a2.add(new DirectOPMLFeed("3", "file://3", "file://3", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false)); - a2.add(new DirectOPMLFeed("4", "file://4", "file://4", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false)); + a2.add(new DirectOPMLFeed("3", "file://3", "file://3", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false, 0)); + a2.add(new DirectOPMLFeed("4", "file://4", "file://4", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false, 0)); g2.setFeeds(a2); final OPMLGuide[] guides = {g1, g2}; @@ -238,14 +238,14 @@ public class TestImportGuidesAction extends TestCase g1 = new OPMLGuide("g1", "icon1", false, null, null, false, 0, false, false, false); a1 = new ArrayList<DefaultOPMLFeed>(); - a1.add(new DirectOPMLFeed("1", "file://1", "file://1", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false)); - a1.add(new DirectOPMLFeed("2", "file://2", "file://2", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false)); + a1.add(new DirectOPMLFeed("1", "file://1", "file://1", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false, 0)); + a1.add(new DirectOPMLFeed("2", "file://2", "file://2", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false, 0)); g1.setFeeds(a1); g2 = new OPMLGuide("g1", null, false, null, null, false, 0, false, false, false); a2 = new ArrayList<DefaultOPMLFeed>(); - a2.add(new DirectOPMLFeed("3", "file://3", "file://3", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false)); - a2.add(new DirectOPMLFeed("4", "file://4", "file://4", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false)); + a2.add(new DirectOPMLFeed("3", "file://3", "file://3", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false, 0)); + a2.add(new DirectOPMLFeed("4", "file://4", "file://4", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false, 0)); g2.setFeeds(a2); final OPMLGuide[] guides = {g1, g2}; @@ -312,8 +312,8 @@ public class TestImportGuidesAction extends TestCase final OPMLGuide guide = new OPMLGuide("g1", "icon", false, null, null, false, 0, false, false, false); final ArrayList<DefaultOPMLFeed> a1 = new ArrayList<DefaultOPMLFeed>(); - a1.add(new DirectOPMLFeed("1", "file://1", "file://1", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false)); - a1.add(new DirectOPMLFeed("2", "file://2", "file://2", 0, null, null, 1, "A", "B", "C", "D", "E", "F", false, 1, false, 0, false)); + a1.add(new DirectOPMLFeed("1", "file://1", "file://1", 0, null, null, -1, null, null, null, null, null, null, false, 1, false, 0, false, 0)); + a1.add(new DirectOPMLFeed("2", "file://2", "file://2", 0, null, null, 1, "A", "B", "C", "D", "E", "F", false, 1, false, 0, false, 0)); guide.setFeeds(a1); // Put in GuidesSet guide with duplicate name to check how dedupe works test/com/salas/bb/core/actions/guide/TestImportGuidesAction.java @@ -48,7 +48,7 @@ public class TestHelper extends TestCase public void testCreateGuideWithRL() { DirectOPMLFeed opmlFeed = new DirectOPMLFeed("Feed", "file://test", "", 1, null, null, -1, - null, null, null, null, null, null, false, 0, false, 1, false); + null, null, null, null, null, null, false, 0, false, 1, false, 0); OPMLReadingList opmlRL = new OPMLReadingList("ReadingList", "file://test"); opmlRL.setFeeds(Arrays.asList(opmlFeed)); @@ -108,7 +108,7 @@ public class TestHelper extends TestCase public void testCreateFeedWithCustomModeAndType() throws MalformedURLException { DirectOPMLFeed opmlFeed = new DirectOPMLFeed("Feed", "file://test", "", 1, null, null, -1, - null, null, null, null, null, null, false, 1, true, 2, false); + null, null, null, null, null, null, false, 1, true, 2, false, 0); DirectFeed feed = Helper.createDirectFeed(new URL("file://test"), opmlFeed); test/com/salas/bb/utils/opml/TestHelper.java d837e1514aa01f0fc99eebadad0ee25c55afb6a0 Aleksey Gureiev spyromus@noizeramp.com http://github.com/pitosalas/blogbridge/commit/a980f8670d717224c9b56503bc3919b83619f448 a980f8670d717224c9b56503bc3919b83619f448 2009-10-17T01:30:45-07:00 2009-10-17T01:30:45-07:00 Supporting sync of handling type 4f20e569ebf9889b09d53e0e095b00fcb2d46b11 Aleksey Gureiev spyromus@noizeramp.com