Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9416E200BC9 for ; Fri, 11 Nov 2016 19:52:41 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 92BE7160AF6; Fri, 11 Nov 2016 18:52:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 74971160B01 for ; Fri, 11 Nov 2016 19:52:40 +0100 (CET) Received: (qmail 80682 invoked by uid 500); 11 Nov 2016 18:52:39 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 80597 invoked by uid 99); 11 Nov 2016 18:52:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Nov 2016 18:52:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C4FFE01F4; Fri, 11 Nov 2016 18:52:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: skolbachev@apache.org To: commits@cayenne.apache.org Date: Fri, 11 Nov 2016 18:52:41 -0000 Message-Id: In-Reply-To: <8bc006afae754347ac7a220d68a5f97a@git.apache.org> References: <8bc006afae754347ac7a220d68a5f97a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/6] cayenne git commit: Windows Look And Feel archived-at: Fri, 11 Nov 2016 18:52:41 -0000 Windows Look And Feel Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5bb62a05 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5bb62a05 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5bb62a05 Branch: refs/heads/master Commit: 5bb62a05a7bb29b3fe042338e83598182b2f71b6 Parents: f3fb4c2 Author: stariy Authored: Thu Nov 10 21:53:31 2016 +0300 Committer: stariy Committed: Thu Nov 10 21:53:31 2016 +0300 ---------------------------------------------------------------------- modeler/cayenne-modeler-win-ext/pom.xml | 93 ++++++++++++++++++++ .../modeler/win/WinCayenneModelerModule.java | 30 +++++++ .../org/apache/cayenne/modeler/win/WinMain.java | 50 +++++++++++ .../modeler/win/WinPlatformInitializer.java | 43 +++++++++ modeler/cayenne-modeler-win/pom.xml | 7 +- modeler/pom.xml | 3 +- 6 files changed, 224 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bb62a05/modeler/cayenne-modeler-win-ext/pom.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-win-ext/pom.xml b/modeler/cayenne-modeler-win-ext/pom.xml new file mode 100644 index 0000000..93e837d --- /dev/null +++ b/modeler/cayenne-modeler-win-ext/pom.xml @@ -0,0 +1,93 @@ + + + + + 4.0.0 + + + cayenne-modeler-parent + org.apache.cayenne.modeler + 4.0.M4-SNAPSHOT + + + Cayenne Modeler Win Extensions + jar + cayenne-modeler-win-ext + + + + + org.apache.cayenne.modeler + cayenne-modeler + ${project.version} + + + + org.apache.cayenne + cayenne-di + ${project.version} + + + + org.apache.cayenne + cayenne-server + ${project.version} + + + + org.apache.cayenne + cayenne-project + ${project.version} + + + + com.jgoodies + jgoodies-looks + + + + + + code-quality + + + + !fast-and-dirty + + + + + + + maven-checkstyle-plugin + + + + maven-pmd-plugin + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bb62a05/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinCayenneModelerModule.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinCayenneModelerModule.java b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinCayenneModelerModule.java new file mode 100644 index 0000000..6c0257e --- /dev/null +++ b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinCayenneModelerModule.java @@ -0,0 +1,30 @@ +/***************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + ****************************************************************/ +package org.apache.cayenne.modeler.win; + +import org.apache.cayenne.di.Binder; +import org.apache.cayenne.di.Module; +import org.apache.cayenne.modeler.init.platform.PlatformInitializer; + +public class WinCayenneModelerModule implements Module { + + public void configure(Binder binder) { + binder.bind(PlatformInitializer.class).to(WinPlatformInitializer.class); + } +} http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bb62a05/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinMain.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinMain.java b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinMain.java new file mode 100644 index 0000000..baf66f5 --- /dev/null +++ b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinMain.java @@ -0,0 +1,50 @@ +/***************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + ****************************************************************/ +package org.apache.cayenne.modeler.win; + +import org.apache.cayenne.di.Module; +import org.apache.cayenne.modeler.Main; + +import java.util.Collection; + +public class WinMain extends Main { + + /** + * Main method that starts the CayenneModeler. + */ + public static void main(String[] args) { + try { + new WinMain(args).launch(); + } catch (Exception e) { + e.printStackTrace(); + System.exit(1); + } + } + + protected WinMain(String[] args) { + super(args); + } + + @Override + protected Collection appendModules(Collection modules) { + modules = super.appendModules(modules); + modules.add(new WinCayenneModelerModule()); + return modules; + } +} http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bb62a05/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java new file mode 100644 index 0000000..3f7871d --- /dev/null +++ b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java @@ -0,0 +1,43 @@ +/***************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + ****************************************************************/ +package org.apache.cayenne.modeler.win; + +import com.jgoodies.looks.windows.WindowsLookAndFeel; +import org.apache.cayenne.modeler.init.platform.PlatformInitializer; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.swing.JFrame; +import javax.swing.UIManager; + +public class WinPlatformInitializer implements PlatformInitializer { + + private static Log logger = LogFactory.getLog(WinPlatformInitializer.class); + + public void setupMenus(JFrame frame) { + } + + public void initLookAndFeel() { + try { + UIManager.setLookAndFeel(WindowsLookAndFeel.class.getName()); + } catch (Exception e) { + logger.warn("Error installing L&F: " + WindowsLookAndFeel.class.getName(), e); + } + } +} http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bb62a05/modeler/cayenne-modeler-win/pom.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-win/pom.xml b/modeler/cayenne-modeler-win/pom.xml index c5e355a..99a3e7d 100644 --- a/modeler/cayenne-modeler-win/pom.xml +++ b/modeler/cayenne-modeler-win/pom.xml @@ -39,6 +39,11 @@ ${project.version} + + org.apache.cayenne.modeler + cayenne-modeler-win-ext + ${project.version} +