Projects >> AbFab3D >>7dce1e8059b2af958445ec0fc4725e664eb00b89

Chunk
Conflicting content 
            ps.println("    }");
            ps.println();
            ps.println("    public void launch() {");
<<<<<<< HEAD
            ps.println("        prefs = Preferences.userNodeForPackage(this.getClass());");
=======
        	ps.println("        prefs = Preferences.userNodeForPackage(this.getClass());");
        	ps.println("        recentFiles = new RecentFiles(MAX_RECENT_FILES, prefs);");
        	ps.println("        recentFilesMenuItems = new JMenuItem[MAX_RECENT_FILES];");
>>>>>>> d52a13878dbc67580fb586c3147ce066f503e587
//            ps.println("        params = kernel.getParams();");
            ps.println("        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);");
            ps.println("        setupUI();");
Solution content 
            ps.println("    }");
            ps.println();
            ps.println("    public void launch() {");
        	ps.println("        prefs = Preferences.userNodeForPackage(this.getClass());");
        	ps.println("        recentFiles = new RecentFiles(MAX_RECENT_FILES, prefs);");
        	ps.println("        recentFilesMenuItems = new JMenuItem[MAX_RECENT_FILES];");

//            ps.println("        params = kernel.getParams();");
            ps.println("        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);");
            ps.println("        setupUI();");
File
JavaStandaloneUICreator.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
    }

    public void createMenu(PrintStream ps) {
<<<<<<< HEAD
        ps.println(indent(8) + "JMenuBar menubar = new JMenuBar();");
        ps.println(indent(8) + "JMenu filemenu = new JMenu(\"File\");");
        ps.println(indent(8) + "fileOpen = new JMenuItem(\"Open\");");
        ps.println(indent(8) + "fileSave = new JMenuItem(\"Save\");");
        ps.println(indent(8) + "fileOpen.addActionListener(this);");
        ps.println(indent(8) + "fileSave.addActionListener(this);");
        ps.println(indent(8) + "filemenu.add(fileOpen);");
        ps.println(indent(8) + "filemenu.add(fileSave);");
        ps.println(indent(8) + "menubar.add(filemenu);");
        ps.println(indent(8) + "setJMenuBar(menubar);");
        ps.println(indent(8) + "openDialog = new JFileChooser(new File(prefs.get(LAST_DIR, DEFAULT_DIR)));");
        ps.println(indent(8) + "saveDialog = new JFileChooser(new File(prefs.get(LAST_DIR, DEFAULT_DIR)));");
=======
    	ps.println(indent(8) + "JMenuBar menubar = new JMenuBar();");
    	ps.println(indent(8) + "filemenu = new JMenu(\"File\");");
    	ps.println(indent(8) + "fileOpen = new JMenuItem(\"Open\");");
    	ps.println(indent(8) + "fileSave = new JMenuItem(\"Save\");");
    	ps.println(indent(8) + "fileOpen.addActionListener(this);");
    	ps.println(indent(8) + "fileSave.addActionListener(this);");
    	ps.println(indent(8) + "filemenu.add(fileOpen);");
    	ps.println(indent(8) + "filemenu.add(fileSave);");
    	ps.println(indent(8) + "menubar.add(filemenu);");
    	ps.println(indent(8) + "setJMenuBar(menubar);");
    	ps.println(indent(8) + "FileNameExtensionFilter filter = new FileNameExtensionFilter(\"AbFab3D Parameters File\", FILE_EXTENSION);");
    	ps.println(indent(8) + "openDialog = new JFileChooser(new File(prefs.get(LAST_DIR, DEFAULT_DIR)));");
    	ps.println(indent(8) + "openDialog.setFileFilter(filter);");
    	ps.println(indent(8) + "saveDialog = new JFileChooser(new File(prefs.get(LAST_DIR, DEFAULT_DIR)));");
    	ps.println(indent(8) + "saveDialog.setFileFilter(filter);");
    	
    	ps.println(indent(8) + "filemenu.addSeparator();");
    	
    	ps.println(indent(8) + "int size = recentFiles.size();");
    	ps.println(indent(8) + "for (int i=0; i>>>>>> d52a13878dbc67580fb586c3147ce066f503e587
    }

    /**
Solution content 
    }

    public void createMenu(PrintStream ps) {
    	ps.println(indent(8) + "JMenuBar menubar = new JMenuBar();");
    	ps.println(indent(8) + "filemenu = new JMenu(\"File\");");
    	ps.println(indent(8) + "fileOpen = new JMenuItem(\"Open\");");
    	ps.println(indent(8) + "fileSave = new JMenuItem(\"Save\");");
    	ps.println(indent(8) + "fileOpen.addActionListener(this);");
    	ps.println(indent(8) + "fileSave.addActionListener(this);");
    	ps.println(indent(8) + "filemenu.add(fileOpen);");
    	ps.println(indent(8) + "filemenu.add(fileSave);");
    	ps.println(indent(8) + "menubar.add(filemenu);");
    	ps.println(indent(8) + "setJMenuBar(menubar);");
    	ps.println(indent(8) + "FileNameExtensionFilter filter = new FileNameExtensionFilter(\"AbFab3D Parameters File\", FILE_EXTENSION);");
    	ps.println(indent(8) + "openDialog = new JFileChooser(new File(prefs.get(LAST_DIR, DEFAULT_DIR)));");
    	ps.println(indent(8) + "openDialog.setFileFilter(filter);");
    	ps.println(indent(8) + "saveDialog = new JFileChooser(new File(prefs.get(LAST_DIR, DEFAULT_DIR)));");
    	ps.println(indent(8) + "saveDialog.setFileFilter(filter);");
    	
    	ps.println(indent(8) + "filemenu.addSeparator();");
    	
    	ps.println(indent(8) + "int size = recentFiles.size();");
    	ps.println(indent(8) + "for (int i=0; i
File
JavaStandaloneUICreator.java
Developer's decision
Version 2
Kind of conflict
Method invocation