From e3e8956d1353d4623d5997cd7122fbbb2a817875 Mon Sep 17 00:00:00 2001 From: alfred Date: Wed, 30 Aug 2006 08:36:25 +0000 Subject: [PATCH] editable comment style git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1407 6f19259b-4bc3-4df7-8a09-765794883524 --- .../org/tianocore/migration/FirstPanel.java | 16 ++++++++++++++-- .../org/tianocore/migration/MigrationTool.java | 2 +- .../org/tianocore/migration/ModuleReader.java | 11 +++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java b/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java index c78ad97bb3..fac874e381 100644 --- a/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java +++ b/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java @@ -29,7 +29,7 @@ public final class FirstPanel extends JPanel implements ActionListener, ItemList private String startpath; private ModuleInfo mi; - private JButton moduleButton, goButton, msaEditorButton, criticButton; + private JButton moduleButton, goButton, msaEditorButton, criticButton, specifyCommentButton; private JTextField moduletext; private JTextArea log; private JFileChooser fc; @@ -57,6 +57,9 @@ public final class FirstPanel extends JPanel implements ActionListener, ItemList criticButton = new JButton("Critic"); criticButton.addActionListener(this); + specifyCommentButton = new JButton("Comment Style"); + specifyCommentButton.addActionListener(this); + moduletext = new JTextField(30); filebox = new JCheckBox("Output to logfile", true); @@ -90,7 +93,9 @@ public final class FirstPanel extends JPanel implements ActionListener, ItemList cst.gridx = 1; cst.gridy = 0; - gridbag.setConstraints(criticButton, cst); + gridbag.setConstraints(specifyCommentButton, cst); + add(specifyCommentButton); + //gridbag.setConstraints(criticButton, cst); //add(criticButton); JPanel checkboxPanel = new JPanel(); @@ -199,6 +204,13 @@ public final class FirstPanel extends JPanel implements ActionListener, ItemList println(en.getMessage()); } } + if ( e.getSource() == specifyCommentButton) { + try { // input examine is not imposed but should be added + MigrationTool.MIGRATIONCOMMENT = getInput("Please type in wanted comment style used by the tool\nbe sure to start with '//', or you won't enjoy the result"); + } catch (Exception en) { + println(en.getMessage()); + } + } } public void itemStateChanged(ItemEvent e) { diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java index e1e769f62d..04ab0221b9 100644 --- a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java +++ b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java @@ -7,7 +7,7 @@ public class MigrationTool { public static UI ui = null; public static Database db = null; - public static final String MIGRATIONCOMMENT = "//%$//"; + public static String MIGRATIONCOMMENT = "//%$//"; public static boolean printModuleInfo = false; public static boolean doCritic = false; diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java index e7b62f0b97..bc3fd75cb2 100644 --- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java +++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java @@ -136,6 +136,16 @@ public final class ModuleReader { rd = new BufferedReader(new FileReader(mi.modulepath + File.separator + curFile)); Common.ensureDir(mi.modulepath + File.separator + "temp" + File.separator + curFile); outfile = new PrintWriter(new BufferedWriter(new FileWriter(mi.modulepath + File.separator + "temp" + File.separator + curFile))); + + /* + if (curFile.contains(".dxs")) { + if (mi.moduletype.contains("PEI")) { + + } else { + + } + } + */ while ((line = rd.readLine()) != null) { if (line.contains("#include")) { mtrinclude = ptninclude.matcher(line); @@ -148,6 +158,7 @@ public final class ModuleReader { } outfile.flush(); outfile.close(); + } } -- 2.39.2