Merge remote-tracking branch 'origin/main'
This commit is contained in:
		
						commit
						eb896677e3
					
				| 
						 | 
					@ -0,0 +1,124 @@
 | 
				
			||||||
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
 | 
					<project version="4">
 | 
				
			||||||
 | 
					  <component name="Palette2">
 | 
				
			||||||
 | 
					    <group name="Swing">
 | 
				
			||||||
 | 
					      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
 | 
				
			||||||
 | 
					        <initial-values>
 | 
				
			||||||
 | 
					          <property name="text" value="Button" />
 | 
				
			||||||
 | 
					        </initial-values>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
 | 
				
			||||||
 | 
					        <initial-values>
 | 
				
			||||||
 | 
					          <property name="text" value="RadioButton" />
 | 
				
			||||||
 | 
					        </initial-values>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
 | 
				
			||||||
 | 
					        <initial-values>
 | 
				
			||||||
 | 
					          <property name="text" value="CheckBox" />
 | 
				
			||||||
 | 
					        </initial-values>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
 | 
				
			||||||
 | 
					        <initial-values>
 | 
				
			||||||
 | 
					          <property name="text" value="Label" />
 | 
				
			||||||
 | 
					        </initial-values>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
 | 
				
			||||||
 | 
					          <preferred-size width="150" height="-1" />
 | 
				
			||||||
 | 
					        </default-constraints>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
 | 
				
			||||||
 | 
					          <preferred-size width="150" height="-1" />
 | 
				
			||||||
 | 
					        </default-constraints>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
 | 
				
			||||||
 | 
					          <preferred-size width="150" height="-1" />
 | 
				
			||||||
 | 
					        </default-constraints>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
 | 
				
			||||||
 | 
					          <preferred-size width="150" height="50" />
 | 
				
			||||||
 | 
					        </default-constraints>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
 | 
				
			||||||
 | 
					          <preferred-size width="150" height="50" />
 | 
				
			||||||
 | 
					        </default-constraints>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
 | 
				
			||||||
 | 
					          <preferred-size width="150" height="50" />
 | 
				
			||||||
 | 
					        </default-constraints>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
 | 
				
			||||||
 | 
					          <preferred-size width="150" height="50" />
 | 
				
			||||||
 | 
					        </default-constraints>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
 | 
				
			||||||
 | 
					          <preferred-size width="150" height="50" />
 | 
				
			||||||
 | 
					        </default-constraints>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
 | 
				
			||||||
 | 
					          <preferred-size width="150" height="50" />
 | 
				
			||||||
 | 
					        </default-constraints>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
 | 
				
			||||||
 | 
					          <preferred-size width="200" height="200" />
 | 
				
			||||||
 | 
					        </default-constraints>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
 | 
				
			||||||
 | 
					          <preferred-size width="200" height="200" />
 | 
				
			||||||
 | 
					        </default-constraints>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
 | 
				
			||||||
 | 
					          <preferred-size width="-1" height="20" />
 | 
				
			||||||
 | 
					        </default-constraints>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
 | 
				
			||||||
 | 
					        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
 | 
					    </group>
 | 
				
			||||||
 | 
					  </component>
 | 
				
			||||||
 | 
					</project>
 | 
				
			||||||
| 
						 | 
					@ -1,28 +0,0 @@
 | 
				
			||||||
import java.util.ArrayList;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
public class SystemOut {
 | 
					 | 
				
			||||||
    private boolean formatRaw;
 | 
					 | 
				
			||||||
    private int columnWidth;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    public void print(ArrayList text) {
 | 
					 | 
				
			||||||
    if (formatRaw) {
 | 
					 | 
				
			||||||
        for(int counter = 0; counter < text.size(); counter++) {
 | 
					 | 
				
			||||||
            System.out.println("<" + counter + ">: <" + text.get(counter) + ">");
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    else {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    public void formatRaw() {
 | 
					 | 
				
			||||||
    formatRaw = true;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    public void formatFix(int length) {
 | 
					 | 
				
			||||||
    formatRaw = false;
 | 
					 | 
				
			||||||
    columnWidth = length;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -0,0 +1,67 @@
 | 
				
			||||||
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public class TextOutput {
 | 
				
			||||||
 | 
					    private boolean formatRaw;
 | 
				
			||||||
 | 
					    private int columnWidth;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void print(ArrayList<String> text) {
 | 
				
			||||||
 | 
					    if (formatRaw) {
 | 
				
			||||||
 | 
					        for (int counter = 0; counter < text.size(); counter++) {
 | 
				
			||||||
 | 
					            System.out.println("<" + (counter + 1) + ">: <" + text.get(counter) + ">");
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    else {
 | 
				
			||||||
 | 
					        for (String paragraph : text) {
 | 
				
			||||||
 | 
					            String[] words = paragraph.split(" ");
 | 
				
			||||||
 | 
					            int currentLength = 0;
 | 
				
			||||||
 | 
					            for(String word: words) {
 | 
				
			||||||
 | 
					                if(word.length() > columnWidth){
 | 
				
			||||||
 | 
					                    String[] letters = word.split("");
 | 
				
			||||||
 | 
					                    int letterLenght = letters.length;
 | 
				
			||||||
 | 
					                    int lettersPrinted = 0;
 | 
				
			||||||
 | 
					                    do{
 | 
				
			||||||
 | 
					                        System.out.println();
 | 
				
			||||||
 | 
					                        currentLength = 0;
 | 
				
			||||||
 | 
					                        for(int i=0; i< columnWidth; i++) {
 | 
				
			||||||
 | 
					                            if(letterLenght > 0) {
 | 
				
			||||||
 | 
					                                System.out.print(letters[lettersPrinted]);
 | 
				
			||||||
 | 
					                                letterLenght--;
 | 
				
			||||||
 | 
					                                lettersPrinted++;
 | 
				
			||||||
 | 
					                                currentLength++;
 | 
				
			||||||
 | 
					                            }
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                    while (letterLenght>columnWidth);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                else {
 | 
				
			||||||
 | 
					                    if(word.length() >= columnWidth - currentLength){
 | 
				
			||||||
 | 
					                        System.out.println();
 | 
				
			||||||
 | 
					                        currentLength = 0;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                    System.out.print(word + " ");
 | 
				
			||||||
 | 
					                    currentLength += word.length() + 1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void formatRaw() {
 | 
				
			||||||
 | 
					        formatRaw = true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void formatFix(int length) {
 | 
				
			||||||
 | 
					    formatRaw = false;
 | 
				
			||||||
 | 
					    columnWidth = length;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -1,8 +0,0 @@
 | 
				
			||||||
import static org.junit.jupiter.api.Assertions.*;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
class SystemOutTest {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    public void print(){
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -0,0 +1,30 @@
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.BeforeEach;
 | 
				
			||||||
 | 
					import org.junit.jupiter.api.Test;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import javax.swing.*;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import static org.junit.jupiter.api.Assertions.*;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class TextOutputTest {
 | 
				
			||||||
 | 
					    TextOutput textOutput;
 | 
				
			||||||
 | 
					    ArrayList<String> text;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @BeforeEach
 | 
				
			||||||
 | 
					    public void setup(){
 | 
				
			||||||
 | 
					        textOutput = new TextOutput();
 | 
				
			||||||
 | 
					        textOutput.formatFix(9);
 | 
				
			||||||
 | 
					        //textOutput.formatRaw();
 | 
				
			||||||
 | 
					        text = new ArrayList<>();
 | 
				
			||||||
 | 
					        text.add("123 45678 ");
 | 
				
			||||||
 | 
					        text.add("123456789");
 | 
				
			||||||
 | 
					        text.add("TextTextTextTextTextTextTextTextTextTextTextTextTextText TextTextTextTextTextTextTextTextTextTextTextText TextTextText");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Test
 | 
				
			||||||
 | 
					    public void print(){
 | 
				
			||||||
 | 
					    textOutput.print(text);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
		Loading…
	
		Reference in New Issue