Commit da0fa865 authored by Muhammad Abdul Qadeer Farooqui's avatar Muhammad Abdul Qadeer Farooqui
Browse files

added merge solution

parents
Showing with 495 additions and 0 deletions
+495 -0
# Default ignored files
/shelf/
/workspace.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="create-file" />
</profile>
</annotationProcessing>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
\ No newline at end of file
<?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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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.svg" 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>
\ No newline at end of file
1,hbl,231234123,false
2,hbl,231234123,false
3,hbl,231234123,false
4,hbl,231234123,false
5,hbl,231234123,false
1, Ahmed, 23, job, false, hbl, 231234123, false
2, Qadeer, 23, job, false, hbl, 231234123, false
3, Sahal, 23, job, false, hbl, 231234123, false
4, Arham, 23, job, false, hbl, 231234123, false
5, Naveed, 23, job, false, hbl, 231234123, false
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.example</groupId>
<artifactId>create-file</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
</project>
\ No newline at end of file
public class Bank {
private int id;
private String bankName;
private int accountNumber;
private boolean creditCardStatus;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getBankName() {
return bankName;
}
public void setBankName(String bankName) {
this.bankName = bankName;
}
public long getAccountNumber() {
return accountNumber;
}
public void setAccountNumber(int accountNumber) {
this.accountNumber = accountNumber;
}
public boolean isCreditCardStatus() {
return creditCardStatus;
}
public void setCreditCardStatus(boolean creditCardStatus) {
this.creditCardStatus = creditCardStatus;
}
@Override
public String toString() {
return id + "," + bankName + "," + accountNumber + "," + creditCardStatus + "\n";
}
}
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.Scanner;
public class MyBankFileUpdater {
public static void main(String[] args) {
try {
Bank bank = new Bank();
Scanner userInput = new Scanner(System.in);
System.out.println("Enter bank id: ");
int i = Integer.parseInt(userInput.nextLine());
bank.setId(i);
System.out.println("Enter bank name: ");
String n = userInput.nextLine();
bank.setBankName(n);
System.out.println("Enter bank account number: ");
int a = Integer.parseInt(userInput.nextLine());
bank.setAccountNumber(a);
System.out.println("Enter bank credit card status: ");
boolean c = Boolean.parseBoolean(userInput.nextLine());
bank.setCreditCardStatus(c);
String stringBank = bank.toString();
Files.write(Paths.get("bank.txt"), stringBank.getBytes(), StandardOpenOption.APPEND);
}catch (IOException e) {
//exception handling left as an exercise for the reader
}
}
}
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.Scanner;
public class MyFileCreator {
public static void main(String[] args) {
// create file and then write to that file.
try {
File myFile = new File("/Users/aqadeer/Desktop/java-training-project-2/create-file/test.txt");
if (myFile.createNewFile() || myFile.length() == 0) {
System.out.println("File created " + myFile.getName());
}
else {
System.out.println("File already exists");
}
} catch (IOException ex) {
System.out.println("exception thrown");
}
}
}
import java.io.*;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
public class MyFileMerger
{
public static void main(String[] args) throws IOException
{
// loop to copy each line of
// file1.txt to file3.txt
// while (bankLine != null)
// {
// BufferedReader ur = new BufferedReader(new FileReader("/Users/aqadeer/Desktop/java-training-project-2/create-file/user.txt"));
// String userLine = ur.readLine();
// List<String> bankList = Arrays.asList(bankLine.split(","));
// while (userLine != null) {
// List<String> userList = Arrays.asList(userLine.split(","));
// if (bankList.get(0).equals(userList.get(0))) {
// List<String> newList = Stream.concat(bankList.stream(), userList.stream().filter(x -> !Objects.equals(x, userList.get(0))))
// .collect(Collectors.toList());
// String myStr = newList.toString();
// pw.println(myStr);
// }
// userLine = ur.readLine();
// }
// bankLine = br.readLine();
//
// }
// PrintWriter object for file3.txt
PrintWriter pw = new PrintWriter("merged.txt");
Map<Integer, List<String>> bankMap = new HashMap<>();
Map<Integer, List<String>> userMap = new HashMap<>();
// BufferedReader object for file1.txt
BufferedReader br = new BufferedReader(new FileReader("/Users/aqadeer/Desktop/java-training-project-2/create-file/bank.txt"));
BufferedReader ur = new BufferedReader(new FileReader("/Users/aqadeer/Desktop/java-training-project-2/create-file/user.txt"));
String bankLine = br.readLine();
String userLine = ur.readLine();
while (bankLine != null)
{
List<String> bankList = Arrays.asList(bankLine.split(","));
bankMap.put(Integer.valueOf(bankList.get(0)), bankList.subList(1,bankList.size()));
bankLine = br.readLine();
}
while (userLine != null)
{
List<String> userList = Arrays.asList(userLine.split(","));
userMap.put(Integer.valueOf(userList.get(0)), userList.subList(1,userList.size()));
userLine = ur.readLine();
}
Set<Integer> userKey = userMap.keySet();
for (int id: userKey) {
List<String> present;
present = bankMap.get(id);
if (present != null) {
pw.println(id + ", " + userMap.get(id).get(0) + ", " + userMap.get(id).get(1) + ", " + userMap.get(id).get(2) + ", " + userMap.get(id).get(3) + ", " +
bankMap.get(id).get(0) + ", " + bankMap.get(id).get(1) + ", " + bankMap.get(id).get(2));
}
}
//
// line = br.readLine();
//
// // loop to copy each line of
// // file2.txt to file3.txt
// while(line != null)
// {
// pw.println(line);
// line = br.readLine();
// }
pw.flush();
// closing resources
br.close();
pw.close();
System.out.println("Merged file1.txt and file2.txt into file3.txt");
}
}
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.Scanner;
public class MyUserFileUpdater {
public static void main(String[] args) {
try {
User user = new User();
Scanner userInput = new Scanner(System.in);
System.out.println("Enter user id");
int i = Integer.parseInt(userInput.nextLine());
user.setId(i);
System.out.println("Enter user name");
String n = userInput.nextLine();
user.setName(n);
System.out.println("Enter user age");
int a = Integer.parseInt(userInput.nextLine());
user.setAge(a);
System.out.println("Enter user profession");
String p = userInput.nextLine();
user.setProfession(p);
System.out.println("Enter user martial status");
boolean m = Boolean.parseBoolean(userInput.nextLine());
user.setMartialStatus(m);
String stringUser = user.toString();
Files.write(Paths.get("user.txt"), stringUser.getBytes(), StandardOpenOption.APPEND);
}catch (IOException e) {
//exception handling left as an exercise for the reader
}
}
}
public class User {
private int id;
private String name;
private int age;
private String profession;
private boolean martialStatus;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getAge() {
return age;
}
public void setAge(int age) {
this.age = age;
}
public String getProfession() {
return profession;
}
public void setProfession(String profession) {
this.profession = profession;
}
public boolean getMartialStatus() {
return martialStatus;
}
public void setMartialStatus(boolean martialStatus) {
this.martialStatus = martialStatus;
}
@Override
public String toString() {
return id + "," + name+ "," +age+ "," +profession+ "," +martialStatus + "\n";
}
}
File added
File added
File added
File added
File added
File added
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment