vvt-refactorings.diff

proposed refactorings - Vladimir Tsichevski, 08/20/2025 02:47 PM

new/src/com/goldencode/p2j/ui/chui/ThinClient.java 2025-08-20 16:23:27 +0000
15980	15980
15981	15981	if (widget instanceof FillIn)
15982	15982	{
15983		FillIn fillin = (FillIn) widget;
15984		if (fillin.groupMode)
15985		{
15986		// Don't change the cursor offset.
15987		}
15988	15983	// fill-in's always reset the cursor on the first position, after the
15989	15984	// widget is left
15990		else if (!fillin.isPendingNoZap() && !((FillInConfig) fillin.config()).disableAutoZap)
	15985	FillIn fillin = (FillIn) widget;
	15986	if (!fillin.groupMode &&
	15987	!fillin.isPendingNoZap() && !((FillInConfig) fillin.config()).disableAutoZap)
15991	15988	{
15992		((FillIn) widget).setCursorOffset(0);
	15989	fillin.setCursorOffset(0);
15993	15990	}
15994	15991	}
15995	15992

         *          was inserted.
         * @param   key
         *          The character which will be inserted.
         * @param   isChui
         *          client is executed in ChUI mode
+        *
         * @return  <code>true</code> if after insertion operation cursor is
         *          allowed to go to the next widget.
         */
        private boolean refill(boolean insert, int key, boolean isChui)
+       {
           if (insert)
+          {
              if(!isChui)
+             {
                 return handleGUIInsertMode(key);
+             }
              else
+             {
                 return handleCHUIInsertMode(key);
+             }
+          }
           // Character was removed
           else
+          {
              return handleRemoveMode();
+          }
           return insert ? isChui ? handleCHUIInsertMode(key) : handleGUIInsertMode(key) : handleRemoveMode();
+       }
        /**
         * Handle remove case when a character was deleted.
+        *
         * @return   {@code true} Returns "true" if we successfully handled the removal mode.
         *           {@code false} otherwise.
         * @return   always {@code true}
         */
        private boolean handleRemoveMode()
+       {
           // Current fill-in text is already updated after deletion.
           String newTextAfterDeletion = getText();
           int currentPosition = getCursorOffset();
           // Handle all fill-in cases. Fore the last Fill-In, we do nothing.
           if (!isLastInGroup() &&
               canAppendContentFromNextFillInToCurrentFillIn())
           if (!isLastInGroup() && canAppendContentFromNextFillInToCurrentFillIn())
+          {
              // Current fill-in text is already updated after deletion.
              String newTextAfterDeletion = getText();
              // Append content from the next fill-in to the current Fill-in.
              String newTextAfterShifting = (StringHelper.safeTrimTrailing(newTextAfterDeletion).length() == 0) ?
                    newTextAfterDeletion + StringHelper.safeTrimTrailing(getNextInGroup().getText()) :
                    newTextAfterDeletion + " " + StringHelper.safeTrimTrailing(getNextInGroup().getText());
              updateCurrentContent(newTextAfterShifting, currentPosition);
              StringBuilder newTextAfterShifting = new StringBuilder(newTextAfterDeletion);
              if (StringHelper.safeTrimTrailing(newTextAfterDeletion).length() != 0)
+             {
                 newTextAfterShifting.append(' ');
+             }
              newTextAfterShifting.append(StringHelper.safeTrimTrailing(getNextInGroup().getText()));
              updateCurrentContent(newTextAfterShifting.toString(), getCursorOffset());
              // Shift from the right side to the left side.
              shiftToLeftAllFillInContents();
-...
           // is NOT empty after trailing spaces are removed, a single space (+1) is
           // implicitly added after it before combining with the next FillIn's content.
           // If 'newTextAfterDeletion' IS empty, no space is added, so its effective length is 0.
           int currentTextSize =  (StringHelper.safeTrimTrailing(newTextAfterDeletion).length() == 0)
           final int length = StringHelper.safeTrimTrailing(newTextAfterDeletion).length();
           int currentTextSize =  length == 0
                 ? 0
                 // If not empty, its effective size includes a trailing space.
                 : StringHelper.safeTrimTrailing(newTextAfterDeletion).length() + 1;
                 : length + 1;
           int maxFillInCapacity = config.appFormat.getScreenWidth();
           return StringHelper.safeTrimTrailing(getNextInGroup().getText()).length() + currentTextSize <= maxFillInCapacity;
           return StringHelper.safeTrimTrailing(getNextInGroup().getText()).length()
                    + currentTextSize <= maxFillInCapacity;
+       }
-...
           while (currentFillIn != null)
+          {
              // If is the next fill in is not the last.
              if (currentFillIn.getNextInGroup() != null)
+             {
                 String textFromLeftSide = currentFillIn.getNextInGroup().getText();
                 currentFillIn.updateCurrentContent(textFromLeftSide, textFromLeftSide.length());
+             }
              // We are on the last fill-in.
              else
              final FillIn<O, C> nextInGroup = currentFillIn.getNextInGroup();
              if (nextInGroup == null)
+             {
                 currentFillIn.updateCurrentContent("", 0);
                 return;
+             }
              currentFillIn = currentFillIn.getNextInGroup();
              String textFromLeftSide = nextInGroup.getText();
              currentFillIn.updateCurrentContent(textFromLeftSide, textFromLeftSide.length());
              currentFillIn = nextInGroup;
+          }
+       }
-...
+       {
           // Character is about to be inserted
           String originalText = getText();
           int currentPosition = getCursorOffset();
           int originalTextLengthTrimmed = StringHelper.safeTrimTrailing(originalText).length();
           int maxFillInCapacity = config.appFormat.getScreenWidth();
-...
+          {
              return handleGroupedFullFillInForSpaceKey();
+          }
           int currentPosition = getCursorOffset();
           // Handle simple insert char.
           else
+          {
              if (isWhiteSpaceBeforeCurrentOffset(originalText, currentPosition, maxFillInCapacity))
+             {
                 updateCurrentContent(originalText, originalTextLengthTrimmed);
                 return true;
+             }
              if (shouldPropagateAfterInsertion(originalText, originalTextLengthTrimmed, maxFillInCapacity))
+             {
                 return handlePropagationAfterInsertion(originalText, currentPosition, key);
+             }
              if (canInsertWithoutPropagation(currentPosition, originalTextLengthTrimmed, maxFillInCapacity))
+             {
                 return handleSimpleInsert(originalText, currentPosition, key, maxFillInCapacity);
+             }
           if (isWhiteSpaceBeforeCurrentOffset(originalText, currentPosition, maxFillInCapacity))
+          {
              updateCurrentContent(originalText, originalTextLengthTrimmed);
              return true;
+          }
           if (shouldPropagateAfterInsertion(originalText, originalTextLengthTrimmed, maxFillInCapacity))
+          {
              return handlePropagationAfterInsertion(originalText, currentPosition, key);
+          }
           if (canInsertWithoutPropagation(currentPosition, originalTextLengthTrimmed, maxFillInCapacity))
+          {
              return handleSimpleInsert(originalText, currentPosition, key, maxFillInCapacity);
+          }
           return true;
-...
           // Character is about to be inserted
           String originalText = getText();
           int currentPosition = getCursorOffset();
           int originalTextLengthTrimmed = StringHelper.safeTrimTrailing(originalText).length();
           int maxFillInCapacity = config.appFormat.getScreenWidth();
           if (currentPosition < maxFillInCapacity)
+          {
              return handleSimpleInsert(originalText, currentPosition, key, maxFillInCapacity);
+          }
           else if(String.valueOf((char) key).equals(" ") &&
           if(String.valueOf((char) key).equals(" ") &&
                 !isLastInGroup())
+          {
              // Move the focus to the next fill-in.

Project

General

Profile

FWD » Core Development » User Interface

vvt-refactorings.diff