Second verison completed

Author: Mohammeddaniyal

Diff for: libs/gson.jar

@@ -148,6 +148,8 @@ private void addEventListeners()
 textArea.getDocument().addUndoableEditListener(ev->{
 undoManager.addEdit(ev.getEdit());
 editMenuManager.setEnabledUndoMenuItem(undoManager.canUndo());
+//  Reset Redo (New edits clear the redo stack)
+editMenuManager.setEnabledRedoMenuItem(false);
 }
 );
 
@@ -278,6 +280,11 @@ private boolean isClipboardAvailable()
 return false;
 }
 }
+public void discardUndoManagerAllEdits()
+{
+undoManager.discardAllEdits();
+editMenuManager.setEnabledUndoMenuItem(undoManager.canUndo());
+}
 public void setStatusBarPanelVisibility(boolean visible)
 {
 statusPanel.setVisible(visible);

Diff for: src/main/java/com/thinking/machines/notepad/Notepad.java

@@ -79,6 +79,7 @@ public void setExtension()
 this.filePath=this.filePath+"."+this.extension;
 this.baseFileName=this.file.getName()+"."+this.extension;
 }
+
 }
 public void setDisplayFileName()
 {
@@ -262,11 +263,13 @@ public boolean saveAs(Notepad.Counter c)
 if(choice==JOptionPane.YES_OPTION)
 {
 this.file=selectedFile;
-saveFile(c);
 this.filePath=selectedFile.getAbsolutePath();
 this.fileName=selectedFile.getName();
+this.encoding=Charset.forName("UTF-8");
+this.encoding=EncodingDetector.detectEncoding(file);
 setExtension();
 setDisplayFileName();
+saveFile(c);
 notepad.setFileName(this.filePath);
 notepad.setTitle(this.displayFileName+" - Danipad");
 saved=true;
@@ -284,6 +287,10 @@ else if(choice==JOptionPane.NO_OPTION)
 this.filePath=selectedFile.getAbsolutePath();
 setExtension();
 setDisplayFileName();
+this.file=new File(this.filePath);
+this.file.createNewFile();
+this.encoding=Charset.forName("UTF-8");
+this.encoding=EncodingDetector.detectEncoding(file);
 saveFile(c);
 notepad.setFileName(this.filePath);
 notepad.setTitle(this.displayFileName+" - Danipad");
@@ -294,6 +301,7 @@ else if(choice==JOptionPane.NO_OPTION)
 {
 saved=false;
 JOptionPane.showMessageDialog(notepad,"Failed to save the file. Please check permissions and try again.", "Save Error",JOptionPane.ERROR_MESSAGE);
+System.out.println(exception);
 LogException.log(exception);
 }
 
@@ -312,22 +320,38 @@ public void openFile(Notepad.Counter c)
 }
 else
 {
+this.file=new File(filePath);
+boolean success=setupFileLocation();
 setExtension();
 setDisplayFileName();
 this.file=new File(filePath);
 
-if(!this.file.exists())
+
+if(!success)
+{
+this.filePath="Untitled";
+this.displayFileName=null;
+this.extension=null;
+this.encoding=Charset.forName("UTF-8");
+}
+
+else if(!this.file.exists())
 {
+
 int option=JOptionPane.showConfirmDialog(notepad,"Cannot find the "+filePath+" file.\n\nDo you want to create a new file?","Danipad",JOptionPane.YES_NO_CANCEL_OPTION,JOptionPane.QUESTION_MESSAGE);
 if(option==JOptionPane.YES_OPTION)
 {
 this.file.createNewFile();
 textArea.setText("");
+this.encoding=EncodingDetector.detectEncoding(file);
 //new file created
 }
 else if(option==JOptionPane.NO_OPTION)
 {
 this.filePath="Untitled";
+this.displayFileName=null;
+this.extension=null;
+this.encoding=Charset.forName("UTF-8");
 }
 else if(option==JOptionPane.CANCEL_OPTION)
 {
@@ -385,6 +409,8 @@ protected void done()
 {
 if(bufferedReader!=null) bufferedReader.close();
 c.suppressChangeEvents=false;
+//to ensure the newly loaded content isn't treated as an "Undoable" change
+notepad.discardUndoManagerAllEdits();
 }catch(IOException ioException)
 {
 LogException.log(ioException);
@@ -395,7 +421,9 @@ protected void done()
 worker.execute();
 
 }
-notepad.setTitle(this.displayFileName+"- Danipad");
+if(this.displayFileName!=null)notepad.setTitle(this.displayFileName+"- Danipad");
+else notepad.setTitle("Untitled - Danipad");
+
 }
 notepad.setFileName(this.filePath);
 }catch(IOException exception)
@@ -406,6 +434,41 @@ protected void done()
 LogException.log(exception);
 }
 
+}
+private boolean setupFileLocation()
+{
+File parentDir=this.file.getParentFile();
+if(parentDir==null) return true;
+if(this.file.exists())
+{
+if(this.file.isDirectory())
+{
+JOptionPane.showMessageDialog(notepad,"The given path refers to a directory not a file. Cannot create file","Error",JOptionPane.ERROR_MESSAGE);
+return false;
+}
+}
+else
+{
+if(parentDir!=null && parentDir.exists())
+{
+//file dont exists create file
+}
+else
+{
+//parent dir not exists create the missing directories
+if(parentDir!=null && parentDir.mkdir())
+{
+return true;
+}
+else 
+{
+//failed
+JOptionPane.showMessageDialog(notepad,"The System cannot find the specified path","Warning",JOptionPane.WARNING_MESSAGE);
+return false;
+}
+}
+}
+return true;
 }
 public String getCurrentEncoding()
 {

Diff for: src/main/java/com/thinking/machines/notepad/io/FileHandler.java

@@ -1,4 +1,4 @@
- package com.thinking.machines.notepad.managers;
+package com.thinking.machines.notepad.managers;
 import com.thinking.machines.notepad.Notepad;
 import com.thinking.machines.notepad.io.*;
 import com.thinking.machines.notepad.models.*;
@@ -22,7 +22,7 @@ public class EditMenuManager
 private UndoManager undoManager;
 private SearchManager searchManager;
 private JMenu editMenu;
-private JMenuItem undoMenuItem;
+private JMenuItem undoMenuItem,redoMenuItem;
 private JMenuItem cutMenuItem,copyMenuItem,pasteMenuItem;
 private JMenuItem deleteMenuItem,findMenuItem,findNextMenuItem,findPreviousMenuItem;
 private JMenuItem replaceMenuItem,goToMenuItem,selectAllMenuItem;
@@ -50,6 +50,7 @@ public EditMenuManager(Notepad notepad,JTextArea textArea,JScrollPane scrollPane
 private void initComponents()
 {
 undoMenuItem=new JMenuItem("Undo");
+redoMenuItem=new JMenuItem("Redo");
 cutMenuItem=new JMenuItem("Cut");
 copyMenuItem=new JMenuItem("Copy");
 pasteMenuItem=new JMenuItem("Paste");
@@ -66,6 +67,7 @@ private void initComponents()
 private void addMenuItems()
 {
 editMenu.add(undoMenuItem);
+editMenu.add(redoMenuItem);
 editMenu.add(cutMenuItem);
 editMenu.add(copyMenuItem);
 editMenu.add(pasteMenuItem);
@@ -88,6 +90,7 @@ private void addMenuItems()
 private void bindShortcutKeys()
 {
 undoMenuItem.setAccelerator(KeyStroke.getKeyStroke('Z',Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
+redoMenuItem.setAccelerator(KeyStroke.getKeyStroke('Y',Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
 cutMenuItem.setAccelerator(KeyStroke.getKeyStroke('X',Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
 copyMenuItem.setAccelerator(KeyStroke.getKeyStroke('C',Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
 pasteMenuItem.setAccelerator(KeyStroke.getKeyStroke('V',Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
@@ -105,11 +108,27 @@ private void addEventListeners()
 undoMenuItem.addActionListener(ev->{
 if(undoManager.canUndo())
 {
+int oldPos=textArea.getCaretPosition();
 undoManager.undo();
+int newPos=textArea.getCaretPosition();
+textArea.select(Math.min(oldPos,newPos),Math.max(oldPos,newPos));
+redoMenuItem.setEnabled(true);
 undoMenuItem.setEnabled(undoManager.canUndo());
 }
 });
 
+redoMenuItem.addActionListener(ev->{
+if(undoManager.canRedo())
+{
+int oldPos=textArea.getCaretPosition();
+undoManager.redo();
+int newPos=textArea.getCaretPosition();
+textArea.select(Math.min(oldPos,newPos),Math.max(oldPos,newPos));
+undoMenuItem.setEnabled(undoManager.canUndo());
+redoMenuItem.setEnabled(undoManager.canRedo());
+}
+});
+
 cutMenuItem.addActionListener((ev)->{
 textArea.cut();
 });
@@ -687,7 +706,10 @@ public void setEnabledUndoMenuItem(boolean enable)
 {
 undoMenuItem.setEnabled(enable);
 }
-
+public void setEnabledRedoMenuItem(boolean enable)
+{
+redoMenuItem.setEnabled(enable);
+}
 public void setEnabledCutMenuItem(boolean enable)
 {
 cutMenuItem.setEnabled(enable);

Diff for: src/main/java/com/thinking/machines/notepad/managers/EditMenuManager.java

@@ -2,7 +2,7 @@
 import java.text.*;
 class psp
 {
-public static void main(String gg[])
+public static void wewemain(String gg[])
 {
 String date="01/"+gg[0]+"/"+gg[1];
 SimpleDateFormat sdf=new SimpleDateFormat("dd/MM/yyyy");