Mercurial Hosting > junotu

changeset 105:33f090b497c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
TabEdit: Introduced 'ghosts', so recreated cards are properly linked Covers a very specific case where you have a card open in multiple views (a minimum of 3). You delete it in the first, then save it in the second, the third view will now show that it's editing the recreated card, instead of creating a new card with same values.
author Fox
date Thu, 06 Apr 2023 10:48:15 +0200
parents 144cb44cd75e
children 9ece57b1895d
files src/junotu/Card.java src/junotu/CardWidget.java src/junotu/ColumnCardWidget.java src/junotu/Database.java src/junotu/Main.java src/junotu/TabBoard.java src/junotu/TabCalendarBoard.java src/junotu/TabEdit.java
diffstat 8 files changed, 83 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/src/junotu/Card.java	Thu Apr 06 09:59:12 2023 +0200
+++ b/src/junotu/Card.java	Thu Apr 06 10:48:15 2023 +0200
@@ -44,20 +44,11 @@
 
 	public SortedMap< String, Set<Object> > tags = new TreeMap< String, Set<Object> >();
 
-	public Card()
-	{
-		tagValueSetOnly( TAG_IDENTIFIER, new Long( -1 ) );
-	}
+	public Card() {}
 
-	public long identifierGet()
+	public Long identifierGet()
 	{
-		Long identifier = this.<Long>tagGetAs( TAG_IDENTIFIER );
-
-		if( identifier == null ) {
-			throw new RuntimeException( "Failed to get card identifier. Fatal." );
-		}
-
-		return identifier.longValue();
+		return this.<Long>tagGetAs( TAG_IDENTIFIER );
 	}
 
 	public String titleGet()
--- a/src/junotu/CardWidget.java	Thu Apr 06 09:59:12 2023 +0200
+++ b/src/junotu/CardWidget.java	Thu Apr 06 10:48:15 2023 +0200
@@ -28,7 +28,7 @@
 	{
 		this.setLayout( new GridBagLayout() );
 
-		identifier = card.identifierGet();
+		identifier = card.identifierGet().longValue();
 		JLabel title = new JLabel( card.titleGet(), JLabel.LEFT );
 		JTextArea content = new JTextArea( card.contentGet() );
 
--- a/src/junotu/ColumnCardWidget.java	Thu Apr 06 09:59:12 2023 +0200
+++ b/src/junotu/ColumnCardWidget.java	Thu Apr 06 10:48:15 2023 +0200
@@ -63,7 +63,7 @@
 
 		newCard = card == null;
 		if( !newCard ) {
-			identifier = card.identifierGet();
+			identifier = card.identifierGet().longValue();
 			title.setText(card.titleGet());
 		}
 
--- a/src/junotu/Database.java	Thu Apr 06 09:59:12 2023 +0200
+++ b/src/junotu/Database.java	Thu Apr 06 10:48:15 2023 +0200
@@ -224,8 +224,18 @@
 	public long cardAdd( Card card )
 	{
 
-		highestIdentifier++;
-		card.tagValueSetOnly( Card.TAG_IDENTIFIER, new Long( highestIdentifier ) );
+		Long identifierOverride = card.identifierGet();
+
+		if( identifierOverride != null ) {
+			if( cardGetByIdentifier(identifierOverride) != null ) {
+				throw new RuntimeException("Trying to add card with identifier "+Long.toString(identifierOverride)+", but it is already taken.");
+			}
+		} else {
+			highestIdentifier++;
+			card.tagValueSetOnly( Card.TAG_IDENTIFIER, new Long( highestIdentifier ) );
+		}
+
+		card.tagValueSetOnly( Card.TAG_SAVED, new Long( System.currentTimeMillis() ) );
 		card.tagValueSetOnly( Card.TAG_LAST_EDIT, new Long( System.currentTimeMillis() ) );
 
 		try {
@@ -234,7 +244,7 @@
 			throw new RuntimeException(e);
 		}
 
-		System.out.print( "Added card with identifier "+Long.toString(highestIdentifier)+": '"+card.titleGet()+"'\n" );
+		System.out.print( "Added card with identifier "+Long.toString(card.identifierGet())+": '"+card.titleGet()+"'\n" );
 		searcherRefresh();
 		//luceneWriter.commit();
 
@@ -246,7 +256,14 @@
 	{
 
 		TopDocs topDocuments;
-		Query query = NumericRangeQuery.newLongRange( card.TAG_IDENTIFIER, card.identifierGet(), card.identifierGet(), true, true );
+		Query query = NumericRangeQuery.newLongRange(
+			card.TAG_IDENTIFIER,
+			card.identifierGet().longValue(),
+			card.identifierGet().longValue(),
+			true,
+			true
+		);
+		
 		try {
 			topDocuments = luceneSearcher.search( query, 1 );
 		} catch( IOException e ) {
@@ -313,7 +330,7 @@
 			}
 		}
 
-		cardDeleteRaw(card.identifierGet());
+		cardDeleteRaw(card.identifierGet().longValue());
 
 	}
 
--- a/src/junotu/Main.java	Thu Apr 06 09:59:12 2023 +0200
+++ b/src/junotu/Main.java	Thu Apr 06 10:48:15 2023 +0200
@@ -122,7 +122,7 @@
 			if(
 				windows[i].tabCurrent() == Tab.EDIT
 				&& windows[i].tabEdit.newCard == false
-				&& windows[i].tabEdit.card.identifierGet() == card.identifierGet()
+				&& windows[i].tabEdit.card.identifierGet().longValue() == card.identifierGet().longValue()
 			) {
 				windows[i].tabEdit.markDirty();
 			}
@@ -130,6 +130,24 @@
 		refreshSearches();
 	}
 
+	public static void actionCardLinkGhosts( Window window, Card card )
+	{
+		for( int i = 0; i < windows.length; i++ ) {
+			if( windows[i] == window || windows[i] == null ) {
+				continue;
+			}
+			if(
+				windows[i].tabCurrent() == Tab.EDIT
+				&& windows[i].tabEdit.newCard == true
+				&& windows[i].tabEdit.ghost == true
+				&& windows[i].tabEdit.card.identifierGet().longValue() == card.identifierGet().longValue()
+			) {
+				windows[i].tabEdit.linkGhost(card);
+				continue;
+			}
+		}
+	}
+
 	public static void actionCardDeleted( Window window, Card card )
 	{
 		for( int i = 0; i < windows.length; i++ ) {
@@ -139,10 +157,9 @@
 			if(
 				windows[i].tabCurrent() == Tab.EDIT
 				&& windows[i].tabEdit.newCard == false
-				&& windows[i].tabEdit.card.identifierGet() == card.identifierGet()
+				&& windows[i].tabEdit.card.identifierGet().longValue() == card.identifierGet().longValue()
 			) {
-				windows[i].tabEdit.newCard = true;
-				windows[i].tabEdit.markDirty();
+				windows[i].tabEdit.markGhost();
 			}
 		}
 		refreshSearches();
--- a/src/junotu/TabBoard.java	Thu Apr 06 09:59:12 2023 +0200
+++ b/src/junotu/TabBoard.java	Thu Apr 06 10:48:15 2023 +0200
@@ -199,7 +199,7 @@
 				return;
 			}
 
-			identifier = card.identifierGet();
+			identifier = card.identifierGet().longValue();
 			titleSet(card.titleGet());
 
 			String cardsString = card.<String>tagGetAsOr( Card.TAG_BOARD_COLUMN_CARDS, "" );
@@ -475,7 +475,7 @@
 
 	public void boardEdit( Card card )
 	{
-		identifier = card.identifierGet();
+		identifier = card.identifierGet().longValue();
 
 		columns.removeAll();
 		title.setText(card.titleGet());
--- a/src/junotu/TabCalendarBoard.java	Thu Apr 06 09:59:12 2023 +0200
+++ b/src/junotu/TabCalendarBoard.java	Thu Apr 06 10:48:15 2023 +0200
@@ -205,7 +205,7 @@
 				return;
 			}
 
-			identifier = card.identifierGet();
+			identifier = card.identifierGet().longValue();
 			titleSet(card.titleGet());
 
 			String cardsString = card.<String>tagGetAsOr( Card.TAG_CALENDAR_BOARD_COLUMN_CARDS, "" );
@@ -524,7 +524,7 @@
 			boardSave();
 		} else if( cards.length == 1 ) {
 			card = cards[0];
-			identifier = card.identifierGet();
+			identifier = card.identifierGet().longValue();
 		} else {
 			throw new RuntimeException();
 		}
--- a/src/junotu/TabEdit.java	Thu Apr 06 09:59:12 2023 +0200
+++ b/src/junotu/TabEdit.java	Thu Apr 06 10:48:15 2023 +0200
@@ -69,7 +69,8 @@
 
 	public Card card = null;
 	public boolean newCard = true;
-	public boolean dirty = true;
+	public boolean dirty = true; /* Means has unsaved changes. */
+	public boolean ghost = false; /* Means was deleted, but still remains in current tab. Can only be new, and has special saving rules. */
 
 	private TagWidget editedTag = null;
 	private JTextField editedTagField;
@@ -227,6 +228,7 @@
 	public void cardCreate()
 	{
 		newCard = true;
+		ghost = false;
 		card = new Card();
 		dirty = true;
 		updateTitle();
@@ -237,6 +239,7 @@
 	public void cardEdit( Card card )
 	{
 		newCard = false;
+		ghost = false;
 		this.card = card;
 		title.setText( card.titleGet() );
 		content.setText( card.contentGet() );
@@ -262,11 +265,31 @@
 		updateTitle();
 	}
 
+	public void markGhost()
+	{
+		ghost = true;
+		newCard = true;
+		dirty = true;
+		updateTitle();
+	}
+
+	public void linkGhost( Card card )
+	{
+		if( !ghost ) {
+			throw new RuntimeException();
+		}
+		newCard = false;
+		ghost = false;
+		dirty = true;
+		card.tagValueSetOnly( Card.TAG_IDENTIFIER, card.identifierGet() );
+	}
+
 	private void reset()
 	{
 		title.setText("");
 		content.setText("");
 		card = null;
+		ghost = false;
 	}
 
 	private void updateTitle()
@@ -512,7 +535,7 @@
 			return;
 		}
 
-		Main.database.cardDeleteByIdentifier( card.identifierGet() );
+		Main.database.cardDeleteByIdentifier( card.identifierGet().longValue() );
 
 		Window window = (Window)this.getTopLevelAncestor();
 		Main.actionCardDeleted( window, card );
@@ -539,7 +562,13 @@
 		card.contentSet( content.getText() );
 
 		if( newCard ) {
+			if( !ghost ) {
+				card.tagRemove( Card.TAG_IDENTIFIER ); /* Make sure to use unique identifier. */
+			}
 			Main.database.cardAdd( card );
+			if( ghost ) {
+				Main.actionCardLinkGhosts( window, card );
+			}
 		} else {
 			Main.database.cardUpdate( card, true );
 		}