Some refactoring in TimelineWindow

NotificationsWindow.java

@@ -81,14 +81,14 @@ NotificationsWindow extends JFrame {
 			if (!adisp.isEmpty()) n.actorName = adisp;
 			else n.actorName = aname;
 			n.actorNumId = aid;
-						
+
 			if (n.type != NotificationType.FOLLOW)
 			{
 				Tree<String> post = t.get("status");
 				String pid, phtml, ptext;
 				pid = post.get("id").value;
 				phtml = post.get("content").value;
-				ptext = TimelineComponent.textApproximation(phtml);
+				ptext = TimelineWindow.textApproximation(phtml);
 				n.postId = pid;
 				n.postText = ptext;
 			}
@@ -131,7 +131,7 @@ NotificationsWindow extends JFrame {
 		api.getNotifications(
 			ROW_COUNT, maxId, minId,
 			new RequestListener() {
-			
+
 				public void
 				connectionFailed(IOException eIo)
 				{
@@ -147,7 +147,7 @@ NotificationsWindow extends JFrame {
 				public void
 				requestSucceeded(Tree<String> json)
 				{
-					displayEntity(json);	
+					displayEntity(json);
 				}
 			}
 		);
@@ -306,7 +306,7 @@ implements ComponentListener {
 
 	public void
 	componentHidden(ComponentEvent eC) { }
-	
+
 	public void
 	componentMoved(ComponentEvent eC) { }
 
@@ -343,4 +343,4 @@ implements ComponentListener {
 		setBorder(b1);
 	}
 
-}
+}

PostWindow.java

@@ -66,7 +66,7 @@ PostWindow extends JFrame {
 //  ---%-@-%---
 
 	public void
-	displayEntity(Tree<String> post)
+	readEntity(Tree<String> post)
 	{
         this.post = post;
 
@@ -122,7 +122,7 @@ PostWindow extends JFrame {
 		else display.setMediaPreview(null);
 
 		String html = post.get("content").value;
-		setTitle(TimelineComponent.textApproximation(html));
+		setTitle(TimelineWindow.textApproximation(html));
 
 		display.resetFocus();
         repaint();

RepliesWindow.java

@@ -53,7 +53,7 @@ RepliesWindow extends JFrame {
     public void
     postSelected(Tree<String> post)
     {
-        postWindow.displayEntity(post);
+        postWindow.readEntity(post);
     }
 
     private Tree<String>
@@ -259,7 +259,7 @@ implements TreeSelectionListener {
         toString()
         {
             String html = post.get("content").value;
-            return TimelineComponent.textApproximation(html);
+            return TimelineWindow.textApproximation(html);
         }
 
 //      -=%=-

TimelineWindow.java

@@ -86,11 +86,70 @@ implements ActionListener {
 //  ---%-@-%---
 
 	public void
-	receive(Tree<String> pageEntity)
+	readEntity(Tree<String> postEntityArray)
 	{
-		page.posts = pageEntity;
-		display.displayEntities(page.posts);
-		boolean full = pageEntity.size() >= PREVIEW_COUNT;
+		page.posts = postEntityArray;
+
+		List<PostPreviewComponent> previews;
+		previews = display.getPostPreviews();
+
+		int available = postEntityArray.size();
+		int max = previews.size();
+		assert available <= max;
+
+		for (int o = 0; o < available; ++o)
+		{
+			PostPreviewComponent c = previews.get(o);
+			Tree<String> p = postEntityArray.get(o);
+			Tree<String> a = p.get("account");
+
+			String an = a.get("display_name").value;
+			if (an.isEmpty()) an = a.get("username").value;
+			c.setTopLeft(an);
+
+			Tree<String> boosted = p.get("reblog");
+			if (boosted.size() > 0) {
+				c.setTopLeft("boosted by " + an);
+				p = boosted;
+				a = p.get("account");
+			}
+
+			String f = "";
+			if (p.get("media_attachments").size() > 0) f += "a";
+			String t = "";
+			try {
+				String jv = p.get("created_at").value;
+				ZonedDateTime pv = ZonedDateTime.parse(jv);
+                ZoneId z = ZoneId.systemDefault();
+                pv = pv.withZoneSameInstant(z);
+
+				ZonedDateTime now = ZonedDateTime.now();
+                long d = ChronoUnit.SECONDS.between(pv, now);
+                long s = Math.abs(d);
+                if (s < 30) t = "now";
+                else if (s < 60) t = d + "s";
+                else if (s < 3600) t = (d / 60) + "m";
+                else if (s < 86400) t = (d / 3600) + "h";
+                else t = (d / 86400) + "d";
+			}
+			catch (DateTimeParseException eDt) {
+                assert false;
+            }
+			c.setTopRight(f + " " + t);
+
+			String html = p.get("content").value;
+			String cw = p.get("spoiler_text").value;
+			if (!cw.isEmpty())
+				c.setBottom("(" + cw + ")");
+			else
+				c.setBottom(textApproximation(html));
+		}
+        for (int o = available; o < max; ++o)
+        {
+            previews.get(o).reset();
+        }
+
+		boolean full = !(available < PREVIEW_COUNT);
 		display.setNextPageAvailable(full);
 		display.setPreviousPageAvailable(true);
 		display.resetFocus();
@@ -99,39 +158,55 @@ implements ActionListener {
 	public void
 	refresh()
 	{
-		
+        assert page.posts != null;
+        assert page.posts.size() != 0;
+        Tree<String> first = page.posts.get(0);
+		String firstId = first.get("id").value;
+
+        display.setCursor(new Cursor(Cursor.WAIT_CURSOR));
+        api.getTimelinePage(
+            page.type,
+ 			PREVIEW_COUNT, firstId, null,
+			page.accountNumId, page.listId,
+            new RequestListener() {
+
+                public void
+                connectionFailed(IOException eIo)
+                {
+					JOptionPane.showMessageDialog(
+						TimelineWindow.this,
+						"Failed to fetch page.."
+						+ "\n" + eIo.getMessage()
+					);
+                }
+
+                public void
+                requestFailed(int httpCode, Tree<String> json)
+                {
+                    JOptionPane.showMessageDialog(
+						TimelineWindow.this,
+						"Failed to fetch page.."
+						+ "\n" + json.get("error").value
+						+ "\n(HTTP code: " + httpCode + ")"
+					);
+                }
+
+                public void
+                requestSucceeded(Tree<String> json)
+                {
+					if (json.size() < PREVIEW_COUNT) {
+                        showLatestPage();
+                        return;
+                    }
+                    readEntity(json);
+                }
+
+            }
+        );
+        display.setCursor(null);
 	}
 
-    public void
-    setTimelineType(TimelineType type)
-    {
-        page.type = type;
-        page.accountNumId = null;
-
-		String s1 = type.toString();
-        s1 = s1.charAt(0) + s1.substring(1).toLowerCase();
-        setTitle(s1 + " - JKomasto");
-
-        String s2 = type.toString().toLowerCase();
-		display.setBackgroundImage(ImageApi.local(s2));
-    }
-
-    public TimelineType
-    getTimelineType() { return page.type; }
-
-    public void
-    showAuthorPosts(String authorNumId)
-    {
-        assert authorNumId != null;
-
-        page.type = TimelineType.FEDERATED;
-        page.accountNumId = authorNumId;
-
-        setTitle(authorNumId + " - JKomasto");
-        display.setBackgroundImage(ImageApi.local("profile"));
-    }
-
-    public void
+	public void
     showLatestPage()
     {
         display.setCursor(new Cursor(Cursor.WAIT_CURSOR));
@@ -165,7 +240,7 @@ implements ActionListener {
                 public void
                 requestSucceeded(Tree<String> json)
                 {
-                    receive(json);
+                    readEntity(json);
                 }
 
             }
@@ -174,7 +249,7 @@ implements ActionListener {
     }
 
     public void
-    nextPage()
+    showNextPage()
     {
         assert page.posts != null;
         assert page.posts.size() != 0;
@@ -218,12 +293,7 @@ implements ActionListener {
                         // quietly cancel.
                         return;
                     }
-                    page.posts = json;
-                    display.displayEntities(page.posts);
-                    boolean full = json.size() >= PREVIEW_COUNT;
-                    display.setNextPageAvailable(full);
-                    display.setPreviousPageAvailable(true);
-                    display.resetFocus();
+                    readEntity(json);
                 }
 
             }
@@ -232,7 +302,7 @@ implements ActionListener {
     }
 
     public void
-    previousPage()
+    showPreviousPage()
     {
         assert page.posts != null;
         assert page.posts.size() != 0;
@@ -274,11 +344,7 @@ implements ActionListener {
                         showLatestPage();
                         return;
                     }
-                    page.posts = json;
-                    display.displayEntities(page.posts);
-                    display.setNextPageAvailable(true);
-                    display.setPreviousPageAvailable(true);
-                    display.resetFocus();
+                    readEntity(json);
                 }
 
             }
@@ -286,6 +352,36 @@ implements ActionListener {
         display.setCursor(null);
     }
 
+
+    public void
+    setTimelineType(TimelineType type)
+    {
+        page.type = type;
+        page.accountNumId = null;
+
+		String s1 = type.toString();
+        s1 = s1.charAt(0) + s1.substring(1).toLowerCase();
+        setTitle(s1 + " - JKomasto");
+
+        String s2 = type.toString().toLowerCase();
+		display.setBackgroundImage(ImageApi.local(s2));
+    }
+
+    public TimelineType
+    getTimelineType() { return page.type; }
+
+    public void
+    showAuthorPosts(String authorNumId)
+    {
+        assert authorNumId != null;
+
+        page.type = TimelineType.FEDERATED;
+        page.accountNumId = authorNumId;
+
+        setTitle(authorNumId + " - JKomasto");
+        display.setBackgroundImage(ImageApi.local("profile"));
+    }
+
 	public void
 	openOwnProfile()
 	{
@@ -317,7 +413,7 @@ implements ActionListener {
 
 			public Tree<String>
 			json;
-			
+
 //			-=%=-
 
 			public void
@@ -408,16 +504,20 @@ implements ActionListener {
 //   -  -%-  -
 
     public void
-    postSelected(Tree<String> post)
+    previewSelected(int index)
     {
-        primaire.getAutoViewWindow().displayEntity(post);
+        if (index > page.posts.size()) return;
+        Tree<String> post = page.posts.get(index - 1);
+        primaire.getAutoViewWindow().readEntity(post);
     }
 
     public void
-    postOpened(Tree<String> post)
+    previewOpened(int index)
     {
+        if (index > page.posts.size()) return;
+        Tree<String> post = page.posts.get(index - 1);
         PostWindow w = new PostWindow(primaire);
-        w.displayEntity(post);
+        w.readEntity(post);
         w.setLocationRelativeTo(this);
         w.setVisible(true);
     }
@@ -483,6 +583,36 @@ implements ActionListener {
         }
     }
 
+//	 -	-%-	 -
+
+	public static String
+	textApproximation(String html)
+	{
+		StringBuilder returnee = new StringBuilder();
+		Tree<String> nodes = RudimentaryHTMLParser.depthlessRead(html);
+		if (nodes.size() == 0) return "-";
+		Tree<String> first = nodes.get(0);
+		for (Tree<String> node: nodes)
+		{
+			if (node.key.equals("tag"))
+			{
+				if (node.get(0).key.equals("br"))
+					returnee.append("; ");
+				if (node.get(0).key.equals("p") && node != first)
+					returnee.append("; ");
+			}
+			if (node.key.equals("emoji"))
+			{
+				returnee.append(":" + node.value + ":");
+			}
+			if (node.key.equals("text"))
+			{
+				returnee.append(node.value);
+			}
+		}
+		return returnee.toString();
+	}
+
 //	 -	-%-	 -
 
     private static String
@@ -578,9 +708,6 @@ implements
     private TimelineWindow
     primaire;
 
-	private Tree<String>
-	posts;
-
 //   -  -%-  -
 
     private JButton
@@ -605,64 +732,11 @@ implements
 
 //  ---%-@-%---
 
-	public void
-	displayEntities(Tree<String> postArray)
-	{
-		assert postArray.size() <= postPreviews.size();
-		this.posts = postArray;
-
-		for (int o = 0; o < postArray.size(); ++o)
-		{
-			PostPreviewComponent c = postPreviews.get(o);
-			Tree<String> p = postArray.get(o);
-			Tree<String> a = p.get("account");
-
-			String an = a.get("display_name").value;
-			if (an.isEmpty()) an = a.get("username").value;
-			c.setTopLeft(an);
-
-			Tree<String> boosted = p.get("reblog");
-			if (boosted.size() > 0) {
-				c.setTopLeft("boosted by " + an);
-				p = boosted;
-				a = p.get("account");
-			}
-
-			String f = "";
-			if (p.get("media_attachments").size() > 0) f += "a";
-			String t = "";
-			try {
-				String jv = p.get("created_at").value;
-				ZonedDateTime pv = ZonedDateTime.parse(jv);
-                ZoneId z = ZoneId.systemDefault();
-                pv = pv.withZoneSameInstant(z);
-
-				ZonedDateTime now = ZonedDateTime.now();
-                long d = ChronoUnit.SECONDS.between(pv, now);
-                long s = Math.abs(d);
-                if (s < 30) t = "now";
-                else if (s < 60) t = d + "s";
-                else if (s < 3600) t = (d / 60) + "m";
-                else if (s < 86400) t = (d / 3600) + "h";
-                else t = (d / 86400) + "d";
-			}
-			catch (DateTimeParseException eDt) {
-                assert false;
-            }
-			c.setTopRight(f + " " + t);
-
-			String html = p.get("content").value;
-			String cw = p.get("spoiler_text").value;
-			if (!cw.isEmpty())
-				c.setBottom("(" + cw + ")");
-			else
-				c.setBottom(textApproximation(html));
-		}
-        for (int o = posts.size(); o < postPreviews.size(); ++o)
-        {
-            postPreviews.get(o).reset();
-        }
-	}
+    public List<PostPreviewComponent>
+    getPostPreviews()
+    {
+        return postPreviews;
+    }
 
     public void
     setPageLabel(String label)
@@ -691,16 +765,16 @@ implements
 	protected void
 	paintComponent(Graphics g)
 	{
-        ((java.awt.Graphics2D)g).setRenderingHint(
-        	java.awt.RenderingHints.KEY_ANTIALIASING,
-        	java.awt.RenderingHints.VALUE_ANTIALIAS_ON
-		);
-
-		int w = getWidth(), h = getHeight();
+        int w = getWidth(), h = getHeight();
 		g.clearRect(0, 0, w, h);
 		int h2 = h * 5 / 10, w2 = h2;
 		int x = w - w2, y = h - h2;
 		g.drawImage(backgroundImage, x, y, w2, h2, this);
+
+		((java.awt.Graphics2D)g).setRenderingHint(
+        	java.awt.RenderingHints.KEY_ANTIALIASING,
+        	java.awt.RenderingHints.VALUE_ANTIALIAS_ON
+		);
 	}
 
 	private void
@@ -708,16 +782,19 @@ implements
 	{
         assert c instanceof PostPreviewComponent;
 
-		for (int o = 0; o < postPreviews.size(); ++o)
-		{
-			PostPreviewComponent p = postPreviews.get(o);
-			if (c == p) {
-				primaire.postSelected(posts.get(o));
-				p.setSelected(true);
-        		p.repaint();
-			}
-			else deselect(p);
-		}
+        for (PostPreviewComponent p: postPreviews)
+        {
+            if (p == c) {
+                int index = 1 + postPreviews.indexOf(p);
+                primaire.previewSelected(index);
+                p.setSelected(true);
+                p.repaint();
+            }
+            else {
+                p.setSelected(false);
+                p.repaint();
+            }
+        }
 	}
 
 	private void
@@ -733,13 +810,9 @@ implements
 	private void
 	open(Object c)
 	{
-        assert c instanceof PostPreviewComponent;
-        PostPreviewComponent p = (PostPreviewComponent)c;
-
-        int o = postPreviews.indexOf(p);
+        int o = postPreviews.indexOf(c);
         assert o != -1;
-		if (o >= posts.size()) return;
-		primaire.postOpened(posts.get(o));
+        primaire.previewOpened(1 + o);
 	}
 
     public void
@@ -778,7 +851,7 @@ implements
 
         PostPreviewComponent selected = null;
         for (PostPreviewComponent c: postPreviews)
-            if (c.getSelected()) selected = c;
+            if (c.isSelected()) selected = c;
 
         if (selected == null) return;
         open(selected);
@@ -789,8 +862,8 @@ implements
     {
         Object src = eA.getSource();
 
-        if (src == next) primaire.nextPage();
-        else if (src == prev) primaire.previousPage();
+        if (src == next) primaire.showNextPage();
+        else if (src == prev) primaire.showPreviousPage();
         /*
         * I think the page previews will just forward to us.
         * But I think they'll have to tell us where they are
@@ -812,35 +885,6 @@ implements
     public void
     keyReleased(KeyEvent eK) { }
 
-//	 -	-%-	 -
-
-	public static String
-	textApproximation(String html)
-	{
-		StringBuilder returnee = new StringBuilder();
-		Tree<String> nodes = RudimentaryHTMLParser.depthlessRead(html);
-		if (nodes.size() == 0) return "-";
-		Tree<String> first = nodes.get(0);
-		for (Tree<String> node: nodes)
-		{
-			if (node.key.equals("tag"))
-			{
-				if (node.get(0).key.equals("br"))
-					returnee.append("; ");
-				if (node.get(0).key.equals("p") && node != first)
-					returnee.append("; ");
-			}
-			if (node.key.equals("emoji"))
-			{
-				returnee.append(":" + node.value + ":");
-			}
-			if (node.key.equals("text"))
-			{
-				returnee.append(node.value);
-			}
-		}
-		return returnee.toString();
-	}
 //  ---%-@-%---
 
     TimelineComponent(TimelineWindow primaire)
@@ -926,23 +970,19 @@ PostPreviewComponent extends JComponent {
     }
 
     public void
-    setSelected(boolean selected)
-    {
-		this.selected = selected;
-        if (!selected) setBackground(null);
-        else setBackground(new Color(0, 0, 0, 25));
-    }
+    setSelected(boolean selected) { this.selected = selected; }
 
     public boolean
-    getSelected() { return selected; }
+    isSelected() { return selected; }
 
 //     -    -%-     -
 
     protected void
     paintComponent(Graphics g)
     {
-		if (selected) {
-        	g.setColor(getBackground());
+		if (selected)
+		{
+        	g.setColor(new Color(0, 0, 0, 25));
         	g.fillRect(0, 0, getWidth(), getHeight());
 		}
     }
@@ -952,10 +992,9 @@ PostPreviewComponent extends JComponent {
     public
     PostPreviewComponent()
     {
-        Font f = new JLabel().getFont();
-        Font f1 = f.deriveFont(Font.PLAIN, 12f);
-        Font f2 = f.deriveFont(Font.ITALIC, 12f);
-        Font f3 = f.deriveFont(Font.PLAIN, 14f);
+        Font f1 = new Font("Dialog", Font.PLAIN, 12);
+        Font f2 = new Font("Dialog", Font.ITALIC, 12);
+        Font f3 = new Font("Dialog", Font.PLAIN, 14);
 
         topLeft = new JLabel();
         topLeft.setFont(f1);