Fix JENKINS-15523

jenkinsci · Nov 3, 2012 · f864369 · f864369
1 parent 0038724
commit f864369
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 16 deletions.
diff --git a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckPublisher.java b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckPublisher.java
@@ -0,0 +1,83 @@
+package com.thalesgroup.hudson.plugins.cppcheck;
+
+import com.thalesgroup.hudson.plugins.cppcheck.config.CppcheckConfig;
+import hudson.model.AbstractProject;
+import hudson.tasks.BuildStepDescriptor;
+import hudson.tasks.BuildStepMonitor;
+import hudson.tasks.Publisher;
+import hudson.tasks.Recorder;
+
+/**
+ * @author Gregory Boissinot
+ */
+@Deprecated
+public class CppcheckPublisher extends Recorder {
+
+    private transient CppcheckConfig cppcheckConfig;
+
+    public BuildStepMonitor getRequiredMonitorService() {
+        return BuildStepMonitor.BUILD;
+    }
+
+    public static final CppcheckDescriptor DESCRIPTOR = new CppcheckDescriptor();
+
+    /**
+     * The Cppcheck Descriptor
+     */
+    public static final class CppcheckDescriptor extends BuildStepDescriptor<Publisher> {
+
+        @SuppressWarnings("deprecation")
+        public CppcheckDescriptor() {
+            super(CppcheckPublisher.class);
+            load();
+        }
+
+        public boolean isApplicable(Class<? extends AbstractProject> jobType) {
+            return false;
+        }
+
+        @Override
+        public String getDisplayName() {
+            return "Publish Cppcheck results";
+        }
+
+    }
+
+
+    @SuppressWarnings("unused")
+    private Object readResolve() {
+
+        org.jenkinsci.plugins.cppcheck.config.CppcheckConfig config = new org.jenkinsci.plugins.cppcheck.config.CppcheckConfig();
+        config.setPattern(cppcheckConfig.getCppcheckReportPattern());
+        config.setIgnoreBlankFiles(cppcheckConfig.isIgnoreBlankFiles());
+
+        org.jenkinsci.plugins.cppcheck.config.CppcheckConfigSeverityEvaluation configSeverityEvaluation = new org.jenkinsci.plugins.cppcheck.config.CppcheckConfigSeverityEvaluation(
+                cppcheckConfig.getConfigSeverityEvaluation().getThreshold(),
+                cppcheckConfig.getConfigSeverityEvaluation().getNewThreshold(),
+                cppcheckConfig.getConfigSeverityEvaluation().getFailureThreshold(),
+                cppcheckConfig.getConfigSeverityEvaluation().getNewFailureThreshold(),
+                cppcheckConfig.getConfigSeverityEvaluation().getHealthy(),
+                cppcheckConfig.getConfigSeverityEvaluation().getUnHealthy(),
+                cppcheckConfig.getConfigSeverityEvaluation().isSeverityError(),
+                cppcheckConfig.getConfigSeverityEvaluation().isSeverityPossibleError(),
+                cppcheckConfig.getConfigSeverityEvaluation().isSeverityStyle(),
+                cppcheckConfig.getConfigSeverityEvaluation().isSeverityPossibleStyle(),
+                true);
+        config.setConfigSeverityEvaluation(configSeverityEvaluation);
+
+        org.jenkinsci.plugins.cppcheck.config.CppcheckConfigGraph configGraph = new org.jenkinsci.plugins.cppcheck.config.CppcheckConfigGraph(
+                cppcheckConfig.getConfigGraph().getXSize(),
+                cppcheckConfig.getConfigGraph().getYSize(),
+                cppcheckConfig.getConfigGraph().isDiplayAllError(),
+                cppcheckConfig.getConfigGraph().isDisplaySeverityError(),
+                cppcheckConfig.getConfigGraph().isDisplaySeverityPossibleError(),
+                cppcheckConfig.getConfigGraph().isDisplaySeverityStyle(),
+                cppcheckConfig.getConfigGraph().isDisplaySeverityPossibleStyle(),
+                true);
+        config.setConfigGraph(configGraph);
+
+        org.jenkinsci.plugins.cppcheck.CppcheckPublisher cppcheckPublisher = new org.jenkinsci.plugins.cppcheck.CppcheckPublisher(config);
+        return cppcheckPublisher;
+    }
+
+}
diff --git a/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckPublisher.java b/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckPublisher.java
@@ -72,6 +72,10 @@ public CppcheckPublisher(String pattern,
     }
 
 
+    public CppcheckPublisher(CppcheckConfig cppcheckConfig) {
+        this.cppcheckConfig = cppcheckConfig;
+    }
+
     @SuppressWarnings("unused")
     public CppcheckConfig getCppcheckConfig() {
         return cppcheckConfig;
@@ -213,22 +217,6 @@ public CppcheckConfig getConfig() {
             return new CppcheckConfig();
         }
 
-//        @Override
-//        public Publisher newInstance(StaplerRequest req, JSONObject formData)
-//                throws hudson.model.Descriptor.FormException {
-//
-//            CppcheckPublisher pub = new CppcheckPublisher();
-//            CppcheckConfig cppcheckConfig = req.bindJSON(CppcheckConfig.class, formData);
-//            pub.setCppcheckConfig(cppcheckConfig);
-//
-//            return pub;
-//        }
     }
 
-//
-//    public void setCppcheckConfig(CppcheckConfig cppcheckConfig) {
-//        this.cppcheckConfig = cppcheckConfig;
-//    }
-
-
 }